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

Timestamp:

Jul 12, 2011, 12:11:21 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Replace "\<char>" escaping in DEFINE variables with "'<char>'" quoting. This allows to work around the bug of existing GCC 4.x.x OS/2 builds (that can't handle escaping meta symbols with backslashes in response files) w/o altering each .pro file containing (widely used) "DEFINES += VAR=
\"STRING
\" statements.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -724 +724 @@
 }
 
+static QStringList fixDefines(const QStringList &vals)
+{
+    // Existing GCC 4.x.x builds for OS/2 can't handle escaping meta symbols
+    // (e.g. quotes) with backslashes in response files (probably an OS/2-
+    // specific bug). The fix this replacing all "\<char>" occurences with
+    // "'<char>'"-like singlequoting which works.
+    //
+    // This backslash escaping is so frequently used in .pro files to pass
+    // string defines to C/C++ (in the form of "DEFINES += VAR=\\\"STRING\\\")
+    // that it makes sense to fix it here rather than introduce an OS/2-specific
+    // alteration of the DEFINES statement in each .pro file.
+
+    QStringList result;
+    foreach(const QString &val, vals) {
+        result << QString(val).replace(QRegExp("\\\\(.)"), "'\\1'");
+    }
+    return result;
+}
+
 void GNUMakefileGenerator::createCompilerResponseFiles(QTextStream &t)
 {
@@ -749 +768 @@
                     rt << varGlue("QMAKE_CXXFLAGS", QString::null, "\n", "\n");
                 } else if (!qstrcmp(vars[i], "DEFINES")) {
-                    rt << varGlue("PRL_EXPORT_DEFINES", "-D", "\n-D", "\n")
-                       << varGlue("DEFINES", "-D", "\n-D", "\n");
+                    rt << valGlue(fixDefines(project->values("PRL_EXPORT_DEFINES")),
+                                  "-D", "\n-D", "\n")
+                       << valGlue(fixDefines(project->values("DEFINES")),
+                                  "-D", "\n-D", "\n");
                 } else if (!qstrcmp(vars[i], "INCPATH")) {
                     QString opt = var("QMAKE_CFLAGS_INCDIR");