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

Timestamp:

Jun 29, 2011, 6:36:04 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Fixed incorrect double-quoting of library names and paths containing reserved characters specified in LIBS using -l/-L prefixes (e.g. -lMagic++ would become -l"-lMagic++" in the generated Makefile). Closes #196.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -218 +218 @@
         if (lib.startsWith("-L")) {
             // this is a library path
-            dirs.append(QMakeLocalFileName((*it).mid(2)));
+            dirs.append(QMakeLocalFileName(.mid(2)));
             ++it;
             continue;
@@ -403 +403 @@
 
     // LIBS defined in Profile comes first for gcc
-    project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
-    project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
+    project->values("QMAKE_LIBS") += );
+    project->values("QMAKE_LIBS_PRIVATE") += );
 
     QStringList &configs = project->values("CONFIG");
@@ -490 +490 @@
             QStringList libs = project->values(libVar);
             for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
-                QString lib = escapeFilePath(*it);
+                QString &lib = *it;
+
                 /* lib may be prefixed with -l which is commonly used in e.g. PRF
                  * (feature) files on all platforms; remove it before prepending
@@ -498 +499 @@
                 if (lib.startsWith("-L")) {
                     lib = lib.mid(2);
-                    t << " " << optL << lib;
+                    t << " " << optL << ;
                 } else {
                     if (lib.startsWith("-l"))
                         lib = lib.mid(2);
-                    t << " " << opt << lib;
+                    t << " " << opt << ;
                 }
             }