diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-13 17:44:59 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-21 12:23:35 +0200 |
| commit | ab21b0c0c5b079205591788958eadd92e96e016f (patch) | |
| tree | ded0551f5e3b3ad1f4e20aa825a2d16e6c9a6590 /packaging-tools/mkqt5bld.py | |
| parent | 0f9194f20b092bfc58df3a143e52bd76ca101580 (diff) | |
QNX: Patch qcc-base-qnx.conf on Windows
There is a need to add
-Wl,-rpath-link,$$[QT_INSTALL_LIBS]
on Windows to allow plugins to find their Qt dependencies.
Another workaround is to add
CONFIG+=explicitlib create_prl
in the plugin's .pro file, but this means that all projects
having this problem will have to be modified, hence it's easier
to just patch our installers.
Change-Id: Ibd24db2418ef804d6cb12e84a1ac512ab54f47ec
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Diffstat (limited to 'packaging-tools/mkqt5bld.py')
| -rw-r--r-- | packaging-tools/mkqt5bld.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packaging-tools/mkqt5bld.py b/packaging-tools/mkqt5bld.py index c85bbf3ee..b2e51e35e 100644 --- a/packaging-tools/mkqt5bld.py +++ b/packaging-tools/mkqt5bld.py @@ -824,6 +824,9 @@ def patch_build(): if QNX_BUILD: patch_qnx6_files('lib', 'libQt5.*\.prl', 'QMAKE_PRL_LIBS', '-L[^ ]* ') patch_qnx6_files('lib', 'libQt5.*\.la', 'dependency_libs', '-L[^ ]* ') + # QT-701: internal qnx bug report + if bldinstallercommon.is_win_platform(): + patch_qnx6_files('common', 'qcc-base-qnx\.conf', 'QMAKE_LFLAGS ', '\n', ' -Wl,-rpath-link,$$[QT_INSTALL_LIBS]') patch_qnx6_files('pkgconfig', 'Qt5.*\.pc', 'Libs.private', '-L[^ ]* ') # patch RPath if requested if QT_BUILD_OPTIONS.replace_rpath: |