Changeset 953 for trunk/qmake

Timestamp:

Aug 10, 2011, 5:20:40 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: More precise escaping of illegal characters.

Escaping is now even more smart and will not try to escape strings like
'$(basename $(MYVAR)).ext', instead properly replacing them with
'$(basename $(call q,$(MYVAR))).ext'. This in particular affects extra
targets (that can have something like above in the .target spec).

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -97 +97 @@
     // it at runtime.
     QString ret = path;
-    QString trimmed = path.trimmed();
-    if (!trimmed.startsWith("$(") || !trimmed.endsWith(")")) {
+    
+    
         ret.remove('\"');
         ret.replace(' ', "\\ ");
-        // but we still want to normalize slashes as this is what we do in
+        //  we still want to normalize slashes as this is what we do in
         // other places (e.g. .cpp targets); this function will do it for
         // QMAKE_EXTRA_TARGETS as well
@@ -107 +107 @@
         if (!isDosLikeShell())
             ret.replace('\\', '/');
-    } else {
-        ret = escapeFileVars(ret);
     }
     return ret;