Changeset 934 for trunk

Timestamp:

Aug 2, 2011, 4:28:07 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Don't escape paths with make vars.

This is a regression of r909. Paths in such vars should be already
quoted and escaped so it is an error to do it twice. This in particular
affected DEL_FILE statements in clean targets by quoting paths like
"$(basename $(DESTDIR_TARGET)).map".

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -71 +71 @@
 QString GNUMakefileGenerator::escapeFilePath(const QString &path) const
 {
-    QString ret = Option::fixPathToTargetOS(path, false);
-    if (!isDosLikeShell()) {
-        ret.remove('\"');
-        ret.replace('\\', '/');
-        ret.replace(' ', "\\ ");
-    } else {
-        ret.replace(QRegExp("\""), "");
-        ret.replace(QRegExp("[\\\\/]$"), "");
-        if (ret.contains(QRegExp("[ +&;%]")))
-            ret = quote + ret + quote;
+    QString ret = path;
+    // we assume that make variables contain paths already properly escaped
+    if (!path.contains(QRegExp("\\$\\(([^$)]+)\\)"))) {
+        ret = Option::fixPathToTargetOS(path, false);
+        if (!isDosLikeShell()) {
+            ret.remove('\"');
+            ret.replace('\\', '/');
+            ret.replace(' ', "\\ ");
+        } else {
+            ret.replace(QRegExp("\""), "");
+            ret.replace(QRegExp("[\\\\/]$"), "");
+            if (ret.contains(QRegExp("[ +&;%]")))
+                ret = quote + ret + quote;
+        }
     }
     return ret;