Changeset 671 for trunk/qmake/generators/os2

Timestamp:

Mar 11, 2010, 2:53:08 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Fixed r670 regression.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (1 diff)

trunk/qmake/generators/os2/gnumake.cpp

@@ -777 +777 @@
                          "(?:\\$\\(([^$)]+)\\))");
     rx.setMinimal(true);
-    ret.replace(rx, "$(call q,$(\\1\\2))");
+    int pos = 0;
+    while ((pos = rx.indexIn(ret, pos)) != -1) {
+        QString var = rx.cap(1);
+        if (var.isEmpty())
+            var = rx.cap(2);
+        // there are some make variables that contain multiple paths which we
+        // cannot escape (finding double-quoted spaces is too complex for
+        // the q function), so just skip them hoping they contain no spaces...
+        if (var != "OBJECTS") {
+            var = QString("$(call q,$(%1))").arg(var);
+            ret.replace(pos, rx.matchedLength(), var);
+            pos += var.length();
+        } else {
+            pos += rx.matchedLength();
+        }
+    }
     return ret;
 }