Fix regression in how "pkg-config --static" output is handled

Change a1ea498 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 <[email protected]>
dougcooper · Nov 4, 2019 · 99e43db · 99e43db
1 parent c0bde0d
commit 99e43db
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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)
     }