diff options
| author | John Lindgren <john@jlindgren.net> | 2022-01-08 16:21:27 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-04-12 20:42:42 -0400 |
| commit | a606ce22eb0dd05eef56384d59954edad7da131d (patch) | |
| tree | 01a244ab52261814c9067c6baca538c66b8453a5 /mesonbuild/modules | |
| parent | 589600cb51534decf1ce2a10e4739dc1d4c26ae0 (diff) | |
| download | meson-a606ce22eb0dd05eef56384d59954edad7da131d.zip meson-a606ce22eb0dd05eef56384d59954edad7da131d.tar.gz meson-a606ce22eb0dd05eef56384d59954edad7da131d.tar.bz2 | |
Add support for Qt 6.1+
Qt 6.1 moved the location of some binaries from QT_HOST_BINS to
QT_HOST_LIBEXECS as noted in the changelog:
c515ee178f Move build tools to libexec instead of the bin dir
- Tools that are called by the build system and are unlikely to be
called by the user are now installed to the libexec directory.
https://code.qt.io/cgit/qt/qtreleasenotes.git/tree/qt/6.1.0/release-note.txt
It's possible to help the 'qt' module find the tools by adding Qt's
libexec directory to the PATH environment variable, but this manual
workaround is not ideal.
To compensate, meson now needs to look for moc, rcc, uic, etc. in
QT_HOST_LIBEXECS as well as QT_HOST_BINS.
Co-authored-by: Stefan Hajnoczi <stefanha@jammr.net>
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/qt.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 99581a4..cb8a202 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -131,6 +131,8 @@ class QtBaseModule(ExtensionModule): for b in self.tools: if qt_dep.bindir: 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 # don't know what the unsuffixed one points to without calling it. yield f'{b}-qt{qt_dep.qtver}', b |