Qt provider: Handle file paths with spaces in prl files

This is relevant now that Qt puts full paths into prl files, rather than
just file names.

Change-Id: I3535653eb8e20493a48d78fb2ac0619a96ed64c6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 2 insertions, 3 deletions

diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js
index d16458e0d..aeea2995b 100644
--- a/share/qbs/module-providers/Qt/setup-qt.js
+++ b/share/qbs/module-providers/Qt/setup-qt.js
@@ -683,8 +683,7 @@ function doSetupLibraries(modInfo, qtProps, debugBuild, nonExistingPrlFiles) {
             if (!line.startsWith("QMAKE_PRL_LIBS"))
                 continue;
 
-            // Assuming lib names and directories without spaces here.
-            var parts = splitNonEmpty(line.slice(equalsOffset + 1).trim(), ' ');
+            var parts = extractPaths(line.slice(equalsOffset + 1).trim(), prlFilePath);
             for (i = 0; i < parts.length; ++i) {
                 var part = parts[i];
                 part = part.replace("$$[QT_INSTALL_LIBS]", qtProps.libraryPath);
@@ -910,7 +909,7 @@ function extractPaths(rhs, filePath) {
             if (endIndex === -1)
                 endIndex = rhs.length;
         }
-        paths.push(rhs.slice(startIndex, endIndex));
+        paths.push(FileInfo.cleanPath(rhs.slice(startIndex, endIndex)));
         startIndex = endIndex + 1;
     }
     return paths;