diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-22 17:09:34 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-31 07:53:47 +0000 |
| commit | b42811e10f522c3b04defb83f3e6f1941ef661bb (patch) | |
| tree | 77af247650969a195cadd70c78317275a95d9a7f /packaging-tools/build_wrapper.py | |
| parent | dec026b95b680d80119478fecf7ec43f1eb9fe2c (diff) | |
Qt Creator: Allow adding another Qt 7zip through environment
Change-Id: I44f350e2260b38adfdac3f960129c767d894c0ac
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
| -rw-r--r-- | packaging-tools/build_wrapper.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index 0c2d0b896..6c7443c0c 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -663,6 +663,7 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): build_id = optionDict['BUILD_NUMBER'] icu_libs = optionDict.get('ICU_LIBS') # optional openssl_libs = optionDict.get('OPENSSL_LIBS') # optional + qt_extra_module_url = optionDict.get('QT_EXTRA_MODULE_URL') # optional qt_postfix = os.environ['QT_POSTFIX'] sdktool_base = optionDict.get('SDKTOOL_QTBASESRC_BASE') # optional sdktool_ext = optionDict.get('SDKTOOL_QTBASESRC_EXT') # optional @@ -736,8 +737,12 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): 'qtquickcontrols', 'qtquickcontrols2', 'qtscript', 'qtsvg', 'qttools', 'qttranslations', 'qtx11extras', 'qtxmlpatterns'] qt_module_urls = module_urls(qt_modules) - qt_module_local_urls = [bld_utils.file_url(os.path.join(qtcreator_temp, module_filename(module))) - for module in qt_modules] + if qt_extra_module_url: + qt_module_urls.append(qt_extra_module_url) + qt_module_local_urls = [bld_utils.file_url(os.path.join(qtcreator_temp, os.path.basename(url))) + for url in qt_module_urls] + + # Define Qt Creator build script arguments cmd_args = ['python', '-u', os.path.normpath(SCRIPT_ROOT_DIR + '/bld_qtcreator.py'), '--clean', |