diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:29:52 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:29:53 +0200 |
| commit | 3b271264407e0e2b598f94002b87b1fb1177ac1f (patch) | |
| tree | bd1896c24542ea6ae0279fe0bca6355d3e4fa787 /mkspecs | |
| parent | 1ade5ea41ab80e49e92fe46e0c44f76ee2e5e7fb (diff) | |
| parent | d8efc8d718e3b3a0464f321e740541f5b221a5d6 (diff) | |
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Change-Id: I61c92717cf82cfe2b14a4d7cbe17f03c3634e827
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_common.prf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index ee65c70926..caecb68a84 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -50,6 +50,12 @@ contains(TEMPLATE, .*lib) { } lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace + !equals(qt_libdir, $$rplbase/lib) { + qtlibdir_replace.match = $$qt_libdir + qtlibdir_replace.replace = $$qqt_libdir + qtlibdir_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace + } } # The remainder of this file must not apply to host tools/libraries, |