From b5bb4f762c5caed28204487346d2e82138abf8c8 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 20 May 2019 11:13:06 +0200 Subject: [PATCH] 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 --- mkspecs/features/qt_common.prf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index ee65c70926a..29d6c9fcbc2 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 }