Changeset 912

Timestamp:

Jul 25, 2011, 9:45:36 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: A better fix for r905.

This fixes a r905 regression (closes #229) and still solves the original
problem.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -71 +71 @@
 QString GNUMakefileGenerator::escapeFilePath(const QString &path) const
 {
-    QString ret = path;
+    QString ret = ;
     if (!isDosLikeShell()) {
         ret.remove('\"');
-        ret.replace('\\', "/");
+        ret.replace('\\', );
         ret.replace(' ', "\\ ");
     } else {
-        ret = Option::fixPathToTargetOS(ret, false);
         ret.replace(QRegExp("\""), "");
         ret.replace(QRegExp("[\\\\/]$"), "");
@@ -93 +92 @@
     // but instead use the q function defined in writeMakefile() that will do
     // it at runtime.
-    QString ret = escapeFilePath(path);
+    QString ret = ;
     QString trimmed = path.trimmed();
     if (!trimmed.startsWith("$(") || !trimmed.endsWith(")")) {
         ret.remove('\"');
         ret.replace(' ', "\\ ");
+
+
+
+
+
+
     } else {
         ret = escapeFileVars(ret);