diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-10-31 17:15:39 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-11-27 11:40:46 +0000 |
| commit | 13c19db171ffaebb748e521f75a59f96c44cedca (patch) | |
| tree | 55fc376abdcb8e58d8be1651c712242af91be7b5 /mkspecs | |
| parent | 1e6a680f8399ed3914a80da2f3a7cb3ef30e4a75 (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>
(cherry picked from commit 99e43db7cea1c838993c151d2d40fc2874a94256)
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index d3bdefda65..850ee98057 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -822,6 +822,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) } |