diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-07 13:49:10 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-07 13:50:33 +0200 |
| commit | c4aa1a9289c8652f69ab6e0464ea2e0b2bd5120a (patch) | |
| tree | 555357e466f3135a137196f087dcafd39196bdce /packaging-tools/mkqt5bld.py | |
| parent | ab52d49e4b38b669e631e714c1b7424c8db22430 (diff) | |
Revert "QNX: Add qt.conf file"
It breaks patching binaries, .pc, .la, .pri, etc files using the IFW since the patching relies on the non-patched output of 'qmake -query' which is not the case when qt.conf is present.
This reverts commit bf880661876d03373f430ebfcb2aba5eb83c3514
Change-Id: Id873333e0d1f520144fb85155b198c09e4b1fabf
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Diffstat (limited to 'packaging-tools/mkqt5bld.py')
| -rw-r--r-- | packaging-tools/mkqt5bld.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/packaging-tools/mkqt5bld.py b/packaging-tools/mkqt5bld.py index 1b9d4418e..ce0afbc90 100644 --- a/packaging-tools/mkqt5bld.py +++ b/packaging-tools/mkqt5bld.py @@ -715,22 +715,6 @@ 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 @@ -1114,9 +1098,6 @@ 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() |