diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-30 12:07:15 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-30 12:16:09 +0000 |
| commit | ae0f0228609910e688f250f435d8e83c126b3810 (patch) | |
| tree | 6a92bc2c956eb412df16530aac615048cbcb31ef /packaging-tools/build_wrapper.py | |
| parent | 6e58586f41be77b0d501e36bc2d7d917140d7ddf (diff) | |
QtCreator: Disable wayland again
It seems to be default for e.g. Ubuntu/Gnome 17.10,
_and_ Qt also uses it by default if the platform plugin is available.
(Ubuntu sets XDG_SESSION_TYPE=wayland, which seems to make Qt default
to wayland.)
It is not usable enough for that.
Task-number: QTCREATORBUG-20516
Change-Id: Ib7dbfef8e6f029758ea84870ea01c84100a47171
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index d16232539..cbda0ad82 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -784,8 +784,6 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): 'qtimageformats', 'qtlocation', 'qtmacextras', 'qtquickcontrols', 'qtquickcontrols2', 'qtscript', 'qtsvg', 'qttools', '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) |