diff options
| -rw-r--r-- | mesonbuild/dependencies/qt.py | 2 | ||||
| -rw-r--r-- | unittests/linuxliketests.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py index bad8ceb..562792c 100644 --- a/mesonbuild/dependencies/qt.py +++ b/mesonbuild/dependencies/qt.py @@ -245,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.name}', 'qmake'] + self.tools = [f'qmake{self.qtver}', 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/unittests/linuxliketests.py b/unittests/linuxliketests.py index 406950e..565b328 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -387,8 +387,8 @@ class LinuxlikeTests(BasePlatformTests): Test that qt6 detection with qmake works. This can't be an ordinary test case because it involves setting the environment. ''' - # Verify that qmake is for Qt5 - if not shutil.which('qmake-qt6'): + # Verify that qmake is for Qt6 + if not shutil.which('qmake6'): if not shutil.which('qmake'): raise SkipTest('QMake not found') output = subprocess.getoutput('qmake --version') |