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

Timestamp:

Aug 17, 2011, 7:17:44 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Partly revert r996 and r997.

Some ancient OS/2 tools don't expect trailing separators.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -75 +75 @@
     if (!ret.isEmpty() && !ret.contains(QRegExp("\\$\\(([^$)]+)\\)"))) {
         ret = unescapeFilePath(ret);
+
+
+
         if (!isDosLikeShell()) {
-            ret.replace('\\', '/');
             ret.replace(' ', "\\ ");
         } else {
-            ret.replace('/', '\\');
-            // Note: also quote paths ending with the backslash to avoid
-            // interpreting it as a linebreak
-            if (ret.contains(QRegExp("[ +&;%]")) || ret.endsWith('\\'))
+            if (ret.contains(QRegExp("[ +&;%]")))
                 ret = quote + ret + quote;
         }
@@ -107 +106 @@
             // and 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
-            if (!isDosLikeShell())
-                ret.replace('\\', '/');
-            else
-                ret.replace('/', '\\');
+            // QMAKE_EXTRA_TARGETS as well (this will also remove the trailing
+            // slash, if any, see above)
+            ret = Option::fixPathToTargetOS(ret, false);
         }
     }