diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-10-15 15:22:54 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2018-10-16 09:41:37 +0000 |
| commit | ce94c7c3a92a9461bcda3bc2ed745f4522b229dc (patch) | |
| tree | e9eddfd2e0373dd780f2e4ce736e37340db2aa3d | |
| parent | afa770d45addcc8e669eaab6b6e390c31ae75a3e (diff) | |
Build and install Qt with prefix instead of shadow build
Squish does not build with shadow built Qt.
Also install prefix makes it easier to use prebuilt
Qt for IFW builds.
Change-Id: Ie06204db45bc3002f030b922136ee9d1b88642a1
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| -rw-r--r-- | packaging-tools/bld_ifw_tools.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/packaging-tools/bld_ifw_tools.py b/packaging-tools/bld_ifw_tools.py index badea0ac2..6341b4555 100644 --- a/packaging-tools/bld_ifw_tools.py +++ b/packaging-tools/bld_ifw_tools.py @@ -279,12 +279,11 @@ def build_ifw(options, create_installer=False, build_ifw_examples=False): clean_build_environment(options) #checkout sources prepare_installer_framework(options) - # copy qt sources. Also when fetching qt binaries as there are stuff the qt binaries need - prepare_qt_sources(options) - # extract qt binaries if qt binaries found, else build qt + if options.qt_binaries_static: prepare_compressed_package(options.qt_binaries_static, options.qt_binaries_static_saveas, options.qt_build_dir) else: + prepare_qt_sources(options) build_qt(options, options.qt_build_dir, options.qt_configure_options, options.qt_build_modules) # build installer framework build_installer_framework(options) @@ -371,12 +370,16 @@ def build_qt(options, qt_build_dir, qt_configure_options, qt_modules): cmd_args = options.qt_configure_bin + ' ' + configure_options # shlex does not like backslashes cmd_args = cmd_args.replace('\\', '/') - bldinstallercommon.do_execute_sub_process(shlex.split(cmd_args), qt_build_dir, True, False, get_build_env(options.openssl_dir)) + bldinstallercommon.do_execute_sub_process(shlex.split(cmd_args), options.qt_source_dir, True, False, get_build_env(options.openssl_dir)) print('--------------------------------------------------------------------') print('Building Qt') cmd_args = options.make_cmd cmd_args += qt_modules - bldinstallercommon.do_execute_sub_process(cmd_args.split(' '), qt_build_dir, True, False, get_build_env(options.openssl_dir)) + bldinstallercommon.do_execute_sub_process(cmd_args.split(' '), options.qt_source_dir, True, False, get_build_env(options.openssl_dir)) + print('--------------------------------------------------------------------') + print('Installing Qt') + cmd_args = options.make_install_cmd + bldinstallercommon.do_execute_sub_process(cmd_args.split(' '), options.qt_source_dir) ############################### # function |