diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-05-02 13:18:35 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-05-02 13:04:22 +0000 |
commit | d5071a4016ec663f8ec7c89ec7ebabea54b3260f (patch) | |
tree | 62e292cb325fcbbced3f897004462042bcc7bd91 /mkspecs | |
parent | 389dec3e7ca530d7d6944772a1152d130cfb8e70 (diff) |
Fix prl replacements if libdir is in QMAKE_DEFAULT_LIBDIRS
QMAKE_PRL_LIBS contains absolute paths to libraries, e.g. libqtpcre2.a.
On "make install" the libdir is replaced with the installation target
libdir. If the libdir is in QMAKE_DEFAULT_LIBDIRS (e.g. /usr) then the
replacement was empty. That worked fine for include paths but not for
paths referencing files in that libdir:
/my/build/lib/qtbase/lib/libqtpcre2.a would become /libqtpcre2.a.
Add another replacement that takes care of file paths and inserts
$$[QT_INSTALL_LIBS].
Fixes: QTBUG-75460
Change-Id: I4e84478a50c24d4143ad5695493cad2992735cf2
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/qt_common.prf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 6cb2e78c1c..ee65c70926 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -38,6 +38,10 @@ contains(TEMPLATE, .*lib) { qt_libdir = $$[QT_INSTALL_LIBS] } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { + lib_replace0.match = $$rplbase/lib/ + lib_replace0.replace = $$qqt_libdir/ + lib_replace0.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += lib_replace0 lib_replace.match = "[^ ']*$$rplbase/lib" lib_replace.replace = } else { |