Changeset 247 for trunk/qmake

Timestamp:

Oct 17, 2009, 4:24:07 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Make sure that QMAKE_PRL_VERSION is ignored and not appended to the library name when reading .prl files of static libraries.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (1 diff)

trunk/qmake/generators/os2/gnumake.cpp

@@ -130 +130 @@
             if (!versionOverride.isEmpty())
                 target += versionOverride;
-            else if (!libinfo.isEmpty("QMAKE_PRL_VERSION"))
+            else if (!libinfo.values("QMAKE_PRL_CONFIG").contains("staticlib") &&
+                     !libinfo.isEmpty("QMAKE_PRL_VERSION"))
                 target += libinfo.first("QMAKE_PRL_VERSION").replace(".", "");