Changeset 194 for trunk/qmake/generators/os2/gnumake.cpp

Timestamp:

Sep 26, 2009, 1:28:06 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Spaces in dependencies that are actually make variable references could be wrongly escaped with \ (affected RC_FILE processing).

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -87 +87 @@
 QString GNUMakefileGenerator::escapeDependencyPath(const QString &path) const
 {
-    /* dependency escaping is always done Unix-way since this is a requirement
-     * of GNU make which allows " and ' to be part of the file name */
+    // dependency escaping is always done Unix-way since this is a requirement
+    // of GNU make which allows " and ' to be part of the file name.
+    // Note that if the string is a make variable reference, we don't eascape!
     QString ret = path;
-    ret.remove('\"');
-    ret.replace(' ', "\\ ");
+    QString trimmed = path.trimmed();
+    if (!trimmed.startsWith("$(") || !trimmed.endsWith(")")) {
+        ret.remove('\"');
+        ret.replace(' ', "\\ ");
+    }
     return ret;
 }
@@ -695 +699 @@
     if (isDosLikeShell()) {
         QString ret = vars;
-        ret.replace(QRegExp("\\$\\((.+)\\)"), "$(call q,$(\\1))");
+        QRegExp rx = QRegExp("\\$\\((.+)\\)");
+        rx.setMinimal(true);
+        ret.replace(rx, "$(call q,$(\\1))");
         return ret;
     }