aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/mkqt5bld.py
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-05-05 12:39:40 +0200
committerSergio Ahumada <sahumada@blackberry.com>2014-05-07 10:50:46 +0200
commitab52d49e4b38b669e631e714c1b7424c8db22430 (patch)
tree3ee0579884c32797e1b457811254f5177dde989d /packaging-tools/mkqt5bld.py
parentcdd2f3fb31054bbfe20a7fb793afad066faa6f18 (diff)
QNX: Add qt.conf filev5.3.0-rc1-packaging
This will enable us to use the qt5_essentials.7z build package outside of the installers as well, just like a standalone build. Change-Id: Ibb908591fc6110a812a0e3b871024f626aa322de Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Diffstat (limited to 'packaging-tools/mkqt5bld.py')
-rw-r--r--packaging-tools/mkqt5bld.py19
1 files changed, 19 insertions, 0 deletions
diff --git a/packaging-tools/mkqt5bld.py b/packaging-tools/mkqt5bld.py
index ce0afbc90..1b9d4418e 100644
--- a/packaging-tools/mkqt5bld.py
+++ b/packaging-tools/mkqt5bld.py
@@ -715,6 +715,22 @@ def archive_submodules():
###############################
# function
###############################
+def add_qt_conf_file():
+ print_wrap('---------------- Adding qt.conf file to /bin directory ------------------------------')
+ if QNX_BUILD:
+ install_path = os.path.normpath(MAKE_INSTALL_ROOT_DIR + os.sep + SINGLE_INSTALL_DIR_NAME + os.sep + INSTALL_PREFIX)
+ if bldinstallercommon.is_win_platform():
+ install_path = 'C' + install_path[1:]
+ print_wrap('---------- Adding qt.conf to ' + install_path + ' ----------------')
+ qtConfFile = open(os.path.join(install_path, 'bin', 'qt.conf'), "w")
+ qtConfFile.write("[Paths]" + os.linesep)
+ qtConfFile.write("Prefix=.." + os.linesep)
+ qtConfFile.close()
+
+
+###############################
+# function
+###############################
def patch_android_prl_files():
## QTBUG-33660
# remove references to absolute path of the NDK on the build machine
@@ -1098,6 +1114,9 @@ def run_build():
clean_up(MAKE_INSTALL_ROOT_DIR)
# patch files after build
patch_build()
+ # add qt.conf file to bin directory
+ if QNX_BUILD:
+ add_qt_conf_file()
# archive each submodule
archive_submodules()