diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-05-22 15:54:07 +0530 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-05-23 18:24:08 -0400 |
| commit | 22df45a31981874310a78dde0df59a6a7c5ebb29 (patch) | |
| tree | ec0c1a685b3f012a2ff32381c31bc3d858ee1073 /test cases | |
| parent | 1f71911ae4d6c061a3704dbf17430656f874f5b8 (diff) | |
| download | meson-22df45a31981874310a78dde0df59a6a7c5ebb29.zip meson-22df45a31981874310a78dde0df59a6a7c5ebb29.tar.gz meson-22df45a31981874310a78dde0df59a6a7c5ebb29.tar.bz2 | |
qt: Allow specifying separate tools for qt4/5/6
Currently you can only use one of qt4, qt5, qt6 in a single project
when using a machine file because the config-tool lookup for qt only
looks at `qmake` in the machine files, instead of looking up the
binary names directly.
Allow specifying `qmake` `qmake4` `qmake5` and `qmake6`.
This is necessary for gstreamer, which can build separate qt5 and qt6
plugins that are distributed as static libraries, so the user can pick
which one to use.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/frameworks/4 qt/meson.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index 66a4443..825cd57 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -152,7 +152,8 @@ foreach qt : ['qt4', 'qt5', 'qt6'] endif # Check we can apply a version constraint - dependency(qt, modules: qt_modules, version: '>=@0@'.format(qtdep.version()), method : get_option('method')) + accept_versions = ['>=@0@'.format(qtdep.version()), '<@0@'.format(qtdep.version()[0].to_int() + 1)] + dependency(qt, modules: qt_modules, version: accept_versions, method : get_option('method')) endif endforeach |