aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/build_wrapper.py
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-05-17 08:54:00 +0200
committerEike Ziller <eike.ziller@qt.io>2018-05-18 09:36:39 +0000
commit50f78c25333695694468d2899fc5f5b51ef9a07d (patch)
tree67e5d8303f05bbcda037dac2642f5498d86e2b62 /packaging-tools/build_wrapper.py
parent8bb31036f6f1e0c24e9c97ddca37d16c383a2c65 (diff)
Qt Creator: Build boot2qt plugin on macOS
It is required for automotive. Also there is no dependency on perfprofiler (any more?) Change-Id: I6dff3a5874f8703682f957b84a8915f49e3a80a6 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
-rw-r--r--packaging-tools/build_wrapper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py
index 85aae0027..094ac8fbc 100644
--- a/packaging-tools/build_wrapper.py
+++ b/packaging-tools/build_wrapper.py
@@ -856,6 +856,8 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins):
modules=qt_module_local_urls, dependencies=plugin_dependencies, qmake_arguments=qmake_arguments)])
additional_plugins.extend([make_QtcPlugin('isoiconbrowser', 'qtquickdesigner', qtcreator_version,
modules=qt_module_local_urls, dependencies=plugin_dependencies, qmake_arguments=qmake_arguments)])
+ additional_plugins.extend([make_QtcPlugin('b2qt-qtcreator-plugin', 'b2qt-qtcreator-plugin', qtcreator_version, modules=qt_module_local_urls,
+ dependencies=plugin_dependencies, qmake_arguments=qmake_arguments)])
if not bldinstallercommon.is_mac_platform():
build_perfparser = False
if use_separate_elfutils:
@@ -889,8 +891,6 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins):
additional_arguments=perfparser_additional_arguments)])
additional_plugins.extend([make_QtcPlugin('perfprofiler', 'perfprofiler', qtcreator_version,
modules=qt_module_local_urls, dependencies=plugin_dependencies, qmake_arguments=qmake_arguments)])
- additional_plugins.extend([make_QtcPlugin('b2qt-qtcreator-plugin', 'b2qt-qtcreator-plugin', qtcreator_version, modules=qt_module_local_urls,
- dependencies=plugin_dependencies + ['perfprofiler'], qmake_arguments=qmake_arguments)])
additional_plugins.extend([make_QtcPlugin('gammarayintegration', 'gammarayintegration', qtcreator_version,
modules=qt_module_local_urls + [kdsme_url, gammaray_url] + module_urls(['qt3d', 'qtgamepad']),
dependencies=plugin_dependencies + ['b2qt-qtcreator-plugin', 'perfprofiler'],