Changeset 887 for trunk/qmake

Timestamp:

Jul 13, 2011, 12:40:40 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Reverted r162 since TARGET_SHORT does not affect .lib names any more.

File:

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

trunk/qmake/generators/makefile.cpp

@@ -1113 +1113 @@
 MakefileGenerator::writePrlFile()
 {
-    // note: on OS/2, we need .prl even for plugins since we use
-    // QMAKE_PRL_TARGET from there to translate universally used long plugin
-    // names to short names of actual OS/2 DLL libraries (which cannot exceed
-    // the 8x3 limit)
-
     if((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
             Option::qmake_mode == Option::QMAKE_GENERATE_PRL)
@@ -1124 +1119 @@
        && (project->first("TEMPLATE") == "lib"
        || project->first("TEMPLATE") == "vclib")
-       && (project->isActiveConfig("os2") || !project->isActiveConfig("plugin"))
-       ) { //write prl file
+       && !project->isActiveConfig("plugin")) { //write prl file
         QString local_prl = prlFileName();
         QString prl = fileFixify(local_prl);