diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-06-18 15:54:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-06-19 05:59:57 +0000 |
| commit | 1dd38fb09eae8986807289b33f1a85caf49ea30d (patch) | |
| tree | d2b9d33bc9c3af02bdaa7e8f9a551a53068a2093 /packaging-tools/build_wrapper.py | |
| parent | 6acb8a35fbb967258dfe7bc2c761f355b35d8183 (diff) | |
Qt Creator: Build gammaray + appmanager integration on macOS
Change-Id: Ic8138c89fd098fc84a972e16ba6fc8c3d92d63c5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
| -rw-r--r-- | packaging-tools/build_wrapper.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index 675c2982d..a00a9ee03 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -850,6 +850,18 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): 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)]) + 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'], + qmake_arguments=qmake_arguments, + additional_arguments=[ + '--deploy-command', 'python', + '--deploy-command=-u', + '--deploy-command', os.path.join(work_dir, 'gammarayintegration', 'scripts', 'deploy.py')])]) + additional_plugins.extend([make_QtcPlugin('appmanagerintegration', 'pcore-plugin-appman', qtcreator_version, + modules=qt_module_local_urls, + dependencies=plugin_dependencies + ['b2qt-qtcreator-plugin'], + qmake_arguments=qmake_arguments)]) if not bldinstallercommon.is_mac_platform(): build_perfparser = False if use_separate_elfutils: @@ -883,18 +895,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('gammarayintegration', 'gammarayintegration', qtcreator_version, - modules=qt_module_local_urls + [kdsme_url, gammaray_url] + module_urls(['qt3d', 'qtgamepad']), - dependencies=plugin_dependencies + ['b2qt-qtcreator-plugin', 'perfprofiler'], - qmake_arguments=qmake_arguments, - additional_arguments=[ - '--deploy-command', 'python', - '--deploy-command=-u', - '--deploy-command', os.path.join(work_dir, 'gammarayintegration', 'scripts', 'deploy.py')])]) - additional_plugins.extend([make_QtcPlugin('appmanagerintegration', 'pcore-plugin-appman', qtcreator_version, - modules=qt_module_local_urls, - dependencies=plugin_dependencies + ['b2qt-qtcreator-plugin'], - qmake_arguments=qmake_arguments)]) # qmlpreview does work on macOs additional_plugins.extend([make_QtcPlugin('qmlpreview', 'qmlpreview', qtcreator_version, |