Fix parsing compiler defines

We should not stop at the second space but include the rest of the
string.

Change-Id: I94d18fb0aed968ab8ecd2b46fbb22d3cba89ac88
Fixes: QBS-1621
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 5 insertions, 3 deletions

diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js
index 5633b7d22..586564d73 100644
--- a/share/qbs/imports/qbs/ModUtils/utils.js
+++ b/share/qbs/imports/qbs/ModUtils/utils.js
@@ -638,10 +638,12 @@ function toJSLiteral(v) {
 function extractMacros(output) {
     var m = {};
     output.trim().split(/\r?\n/g).map(function (line) {
-        if (!line.startsWith("#define"))
+        var prefix = "#define ";
+        if (!line.startsWith(prefix))
             return;
-        var parts = line.split(" ", 3);
-        m[parts[1]] = parts[2];
+        var index = line.indexOf(" ", prefix.length);
+        if (index !== -1)
+            m[line.substr(prefix.length, index - prefix.length)] = line.substr(index + 1);
     });
     return m;
 }