From d68a0651e4bf650219e1d504a72f18fec1e94d4d Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 9 Feb 2022 21:21:24 -0500 Subject: [PATCH] qt module: also prefer the changed name scheme for the tools Although Qt6 has decided these are "internal" commands and should never be run directly, so they don't get symlinked to /usr/bin at all, and are only available in the qt_dep.bindir anyway. But, the general naming pattern should be followed on principle. --- mesonbuild/modules/qt.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index cb8a202c8..9fd9f66df 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -133,8 +133,10 @@ class QtBaseModule(ExtensionModule): yield os.path.join(qt_dep.bindir, b), b if qt_dep.libexecdir: yield os.path.join(qt_dep.libexecdir, b), b - # prefer the -qt of the tool to the plain one, as we + # prefer the (official) or (unofficial) -qt + # of the tool to the plain one, as we # don't know what the unsuffixed one points to without calling it. + yield f'{b}{qt_dep.qtver}', b yield f'{b}-qt{qt_dep.qtver}', b yield b, b