summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-10-31 17:15:39 +0100
committerKai Koehne <kai.koehne@qt.io>2019-11-04 09:31:56 +0100
commit99e43db7cea1c838993c151d2d40fc2874a94256 (patch)
tree3cda6ff0152d036dcdafb71df0f0e9f55ae97d18
parentc0bde0da812b2f63b40150ecc3278ff5c4537c40 (diff)
Fix regression in how "pkg-config --static" output is handled
Change a1ea49878927dfe2 did replace different pkg-config calls for -L, -l arguments to one. Anyhow, it also removed the eval() call that ensured that the return string was split by whitespace, meaning that paths couldn't resolve anymore properly if multiple arguments were returned. Fixes: QTBUG-79668 Change-Id: I4091fea6891ef79836e05f8e87ffa9d69863a8f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--mkspecs/features/qt_configure.prf2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 81110e9f6d..27584b99f5 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -826,6 +826,8 @@ defineTest(qtConfLibrary_pkgConfig) {
return(false)
contains($${1}.libs, ".*\\.$${QMAKE_EXTENSION_STATICLIB}$") {
qtRunLoggedCommand("$$pkg_config --static --libs $$args", libs)|return(false)
+ # Split by space
+ eval(libs = $$libs)
!qtConfResolveLibs($${1}.libs, $$libs): \
return(false)
}