diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-02-09 21:21:24 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-04-12 20:44:51 -0400 |
| commit | d68a0651e4bf650219e1d504a72f18fec1e94d4d (patch) | |
| tree | 63ee91e145931097feb2c06656a862051492dcf2 /mesonbuild/modules | |
| parent | b5a81ff6348ccd8351af495e21884cbb7a56f308 (diff) | |
| download | meson-d68a0651e4bf650219e1d504a72f18fec1e94d4d.zip meson-d68a0651e4bf650219e1d504a72f18fec1e94d4d.tar.gz meson-d68a0651e4bf650219e1d504a72f18fec1e94d4d.tar.bz2 | |
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.
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/qt.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index cb8a202..9fd9f66 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 <tool>-qt<version> of the tool to the plain one, as we + # prefer the (official) <tool><version> or (unofficial) <tool>-qt<version> + # 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 |