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

Timestamp:

Aug 17, 2011, 4:21:20 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Don't trim trailing separators when escaping paths.

To be compatible with other generators don't do it (e.g. the value of DESTDIR
in the Makefile on Win32 retains the trailing slash it gets during internal qmake
processing).

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -74 +74 @@
     // we assume that make variables contain paths already properly escaped
     if (!path.contains(QRegExp("\\$\\(([^$)]+)\\)"))) {
-        ret = Option::fixPathToTargetOS(path, false);
         if (!isDosLikeShell()) {
             ret.remove('\"');
@@ -81 +80 @@
         } else {
             ret.replace(QRegExp("\""), "");
-            ret.replace(QRegExp("[\\\\/]$"), "");
+            ret.replace();
             if (ret.contains(QRegExp("[ +&;%]")))
                 ret = quote + ret + quote;
@@ -107 +106 @@
         // other places (e.g. .cpp targets); this function will do it for
         // QMAKE_EXTRA_TARGETS as well
-        ret = Option::fixPathToTargetOS(ret, false);
         if (!isDosLikeShell())
             ret.replace('\\', '/');
+
+
     }
     return ret;