diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-18 10:18:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-18 13:12:29 +0000 |
| commit | c05b5545333960d88ec37f56a9fb0c4770db48e8 (patch) | |
| tree | db132d3be35040e163bf245bf932d3a4214fea19 /packaging-tools/build_wrapper.py | |
| parent | 50f78c25333695694468d2899fc5f5b51ef9a07d (diff) | |
QtCreator: Don't ship wayland for 4.6.x even when built with Qt 5.11
This is a too intrusive change for a patch release, even if that only
affects the Qt Creator 4.6.x build that is shipped with the Qt 5.11
offline packages.
Change-Id: Ica42c15d34f02439cf686bca1149424ac35411de
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
| -rw-r--r-- | packaging-tools/build_wrapper.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index 094ac8fbc..c28dc0042 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -791,7 +791,9 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): qt_modules = ['qtbase', 'qtdeclarative', 'qtgraphicaleffects', 'qtimageformats', 'qtlocation', 'qtmacextras', 'qtquickcontrols', 'qtquickcontrols2', 'qtscript', 'qtsvg', 'qttools', - 'qttranslations', 'qtwayland', 'qtx11extras', 'qtxmlpatterns'] + 'qttranslations', 'qtx11extras', 'qtxmlpatterns'] + if not qtcreator_version.startswith('4.6.'): + qt_modules.append('qtwayland') qt_module_urls = module_urls(qt_modules) if qt_extra_module_url: qt_module_urls.append(qt_extra_module_url) |