From 9e04102180e9cd2d57c8b11ac3ef4bc9da15bcde Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 19 May 2017 13:53:44 +0200
Subject: fix library retrieval in pkg-config source, take 2

the entry's libs field is supposed to be a single pre-quoted string.
that implies that the libs and libpaths need to be joined first.

amends 7e298e2f.

Task-number: QTBUG-60925
Change-Id: Id85b2784e3c081b3ff8eb9ee2216976691f8580d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 mkspecs/features/qt_configure.prf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 5cbc0d4bfd..964c2393c2 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -581,7 +581,8 @@ defineTest(qtConfLibrary_pkgConfig) {
     version ~= s/[^0-9.].*$//
     $${1}.version = $$first(version)
     export($${1}.version)
-    $${1}.libs = $$libpaths $$libs
+    libpaths += $$libs
+    $${1}.libs = "$$libpaths"
     export($${1}.libs)
     return(true)
 }
-- 
cgit v1.2.3