diff options
| -rw-r--r-- | mesonbuild/dependencies/qt.py | 3 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/test.json | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py index d2be1a4..bad8ceb 100644 --- a/mesonbuild/dependencies/qt.py +++ b/mesonbuild/dependencies/qt.py @@ -127,6 +127,7 @@ class _QtBase: libexecdir: T.Optional[str] = None def __init__(self, name: str, kwargs: T.Dict[str, T.Any]): + self.name = name self.qtname = name.capitalize() self.qtver = name[-1] if self.qtver == "4": @@ -244,7 +245,7 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta): def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]): _QtBase.__init__(self, name, kwargs) - self.tools = [f'qmake-{self.qtname}', 'qmake'] + self.tools = [f'qmake-{self.name}', 'qmake'] # Add additional constraints that the Qt version is met, but preserve # any version requrements the user has set as well. For example, if Qt5 diff --git a/test cases/frameworks/4 qt/test.json b/test cases/frameworks/4 qt/test.json index fbeead5..4df0b49 100644 --- a/test cases/frameworks/4 qt/test.json +++ b/test cases/frameworks/4 qt/test.json @@ -2,8 +2,8 @@ "matrix": { "options": { "method": [ - { "val": "config-tool", "skip_on_jobname": ["fedora", "opensuse"] }, - { "val": "qmake", "skip_on_jobname": ["fedora", "opensuse"] }, + { "val": "config-tool" }, + { "val": "qmake" }, { "val": "pkg-config" } ] } |