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 /src/3rdparty/pcre2/src/pcre2_match_data.c | |
| 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 'src/3rdparty/pcre2/src/pcre2_match_data.c')
0 files changed, 0 insertions, 0 deletions