Changeset 977

Timestamp:

Aug 13, 2011, 10:49:04 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Fixed r953 regression.

Would not detect all matched cases.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (4 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -97 +97 @@
     // it at runtime.
     QString ret = path;
-    if (!path.contains("$(") || (ret = escapeFileVars(path)) == path) {
+    bool matched = false;
+    if (path.contains("$("))
+        ret = escapeFileVars(path, &matched);
+    if (!matched) {
         // didn't find variable references, do plain escaping
         ret.remove('\"');
@@ -821 +824 @@
 
 // static
-QString GNUMakefileGenerator::escapeFileVars(const QString &vars)
+QString GNUMakefileGenerator::escapeFileVars(const QString &vars, bool *matched)
 {
     /* In DOS environment, we escape spaces and other illegal characters in
@@ -835 +838 @@
     rx.setMinimal(true);
     int pos = 0;
+    bool wasMatch = false;
     while ((pos = rx.indexIn(ret, pos)) != -1) {
+        wasMatch = true;
         QString var = rx.cap(1);
         if (var.isEmpty())
@@ -850 +855 @@
         }
     }
+    if (matched)
+        *matched = wasMatch;
     return ret;
 }