diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-05-20 11:13:06 +0200 |
|---|---|---|
| committer | Jörg Bornemann <joerg.bornemann@qt.io> | 2019-05-23 07:29:53 +0000 |
| commit | b5bb4f762c5caed28204487346d2e82138abf8c8 (patch) | |
| tree | 887b3a5bbf407c8e2cfa39e4da3a98da15e52b22 /mkspecs | |
| parent | 9994524d5bf79058ebf344a3f762bd18af1374e8 (diff) | |
Replace absolute Qt lib dir in .prl files
In the case of building a Qt module repository against an installed
qtbase the .prl files contain absolute paths to Qt dependencies e.g.
'/install-prefix/lib/libQt5Core.so'.
Those must be replaced with $$[QT_INSTALL_PREFIX]. The .prl
replacement code however only takes $$MODULE_BASE_OUTDIR/lib into
account.
(cherry picked from commit f00de3322e05c62021082463b6de24805afc1355)
Fixes: QTBUG-75804
Change-Id: Ibf0f90a860d5089f416f903c1d18483d3dcc2ee6
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_common.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index ee65c70926..29d6c9fcbc 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -48,6 +48,8 @@ contains(TEMPLATE, .*lib) { lib_replace.match = $$rplbase/lib lib_replace.replace = $$qqt_libdir } + !equals(qt_libdir, $$rplbase/lib): \ + lib_replace.match = \\($$lib_replace.match\\)\\|\\($$qt_libdir\\) lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace } |