Changeset 629

Timestamp:

Mar 4, 2010, 7:33:53 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Added support for LIBS_PRIVATE introduced in Qt 4.6.

Location:

trunk/qmake/generators/os2

Files:

• gnumake.cpp (modified) (3 diffs)
• gnumake.h (modified) (1 diff)

trunk/qmake/generators/os2/gnumake.cpp

@@ -196 +196 @@
 bool GNUMakefileGenerator::findLibraries()
 {
-    QStringList &libs = project->values("QMAKE_LIBS");
+    return findLibraries("QMAKE_LIBS") && findLibraries("QMAKE_LIBS_PRIVATE");
+}
+
+bool GNUMakefileGenerator::findLibraries(const QString &where)
+{
+    QStringList &libs = project->values(where);
 
     QList<QMakeLocalFileName> dirs;
@@ -383 +388 @@
     // LIBS defined in Profile comes first for gcc
     project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
+
 
     QStringList &configs = project->values("CONFIG");
@@ -463 +469 @@
         QString opt = var("QMAKE_LFLAGS_LIB");
         QString optL = var("QMAKE_LFLAGS_LIBDIR");
-        QStringList libs = project->values("QMAKE_LIBS");
-        for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
-            QString lib = escapeFilePath(*it);
-            /* lib may be prefixed with -l which is commonly used in e.g. PRF
-             * (feature) files on all platforms; remove it before prepending
-             * the compiler-specific option. There is even more weird case
-             * when LIBS contains library paths prefixed with -L; we detect
-             * this as well and replace it with the proper option. */
-            if (lib.startsWith("-L")) {
-                lib = lib.mid(2);
-                t << " " << optL << lib;
-            } else {
-                if (lib.startsWith("-l"))
+        QStringList libVars;
+        libVars << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE";
+        foreach(const QString &libVar, libVars) {
+            QStringList libs = project->values(libVar);
+            for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
+                QString lib = escapeFilePath(*it);
+                /* lib may be prefixed with -l which is commonly used in e.g. PRF
+                 * (feature) files on all platforms; remove it before prepending
+                 * the compiler-specific option. There is even more weird case
+                 * when LIBS contains library paths prefixed with -L; we detect
+                 * this as well and replace it with the proper option. */
+                if (lib.startsWith("-L")) {
                     lib = lib.mid(2);
-                t << " " << opt << lib;
+                    t << " " << optL << lib;
+                } else {
+                    if (lib.startsWith("-l"))
+                        lib = lib.mid(2);
+                    t << " " << opt << lib;
+                }
             }
         }

trunk/qmake/generators/os2/gnumake.h

@@ -82 +82 @@
 
     virtual bool findLibraries();
+
     void fixTargetExt();