aboutsummaryrefslogtreecommitdiff
path: root/unittests/linuxliketests.py
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-02-09 21:13:26 -0500
committerEli Schwartz <eschwartz@archlinux.org>2022-04-12 20:44:07 -0400
commitb5a81ff6348ccd8351af495e21884cbb7a56f308 (patch)
treef07295c0ad012e3f5b0cdc0d26fb8c544209c929 /unittests/linuxliketests.py
parente223136b10a55ebb24c780575092bbf67dd1581c (diff)
downloadmeson-b5a81ff6348ccd8351af495e21884cbb7a56f308.zip
meson-b5a81ff6348ccd8351af495e21884cbb7a56f308.tar.gz
meson-b5a81ff6348ccd8351af495e21884cbb7a56f308.tar.bz2
qt dependency: adapt to the qmake command changed name
Qt now has official guidance for the symlinked names of the tools, which is great. Qt now officially calls the tools `fooX` instead of `foo-qtX` where the major version of Qt is X. Which is not great, because a bit of an unofficial standard had prior art and now needs to change, and we never adapted. Prefer the official name whenever looking up qmake, and in the testsuite, specifically look only for the official name on versions of qt which we know should have that.
Diffstat (limited to 'unittests/linuxliketests.py')
-rw-r--r--unittests/linuxliketests.py4
1 files changed, 2 insertions, 2 deletions
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')