diff options
author | Katja Marttila <katja.marttila@qt.io> | 2020-10-27 12:35:54 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-11-03 09:32:58 +0000 |
commit | c9ff91872c7e852522160441c4726590860c8f73 (patch) | |
tree | aec0ae4d4fb002c7804e03b5d1ec24d31c32dc6e | |
parent | 953f6ed99129e2380f8ed6cd56b007a60489807b (diff) |
IFW: Run qmake recursivelyv6.0.0-beta3-packagingv5.12.10-packaging
We are building documentation with different Qt version, if recursive
qmake is not run it is not picking correct Qt version for documentation
build.
Change-Id: I44495b45067e888a61a3d82fcc5d7a582af880d6
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r-- | packaging-tools/bld_ifw_tools.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging-tools/bld_ifw_tools.py b/packaging-tools/bld_ifw_tools.py index ac0ee3def..4abe88210 100644 --- a/packaging-tools/bld_ifw_tools.py +++ b/packaging-tools/bld_ifw_tools.py @@ -585,7 +585,7 @@ def build_ifw_docs(options): if not os.path.isfile(qmake_bin): print('*** Aborting doc build, unable to find qmake from: {0}'.format(options.qt_build_dir_dynamic)) sys.exit(-1) - cmd_args = qmake_bin + ' ' + options.installer_framework_source_dir + cmd_args = qmake_bin + ' -r ' + options.installer_framework_source_dir bldinstallercommon.do_execute_sub_process(cmd_args.split(' '), options.installer_framework_build_dir) cmd_args = options.make_doc_cmd + ' docs' env = dict(os.environ) |