Changeset 886 for trunk/qmake/generators/makefile.cpp

Timestamp:

Jul 13, 2011, 1:59:46 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Removed unnecessary shortening the import library name for the DLL target when TARGET_SHORT is present. Import libraries are often referenced through the LIBS variable in .pro files and this change makes such referencing work w/o the need to change them to shortened ones for the OS/2 platform. Closes #225. Note: this changeset depends on r885.

File:

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

trunk/qmake/generators/makefile.cpp

@@ -974 +974 @@
     if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
         t << "QMAKE_PRL_SOURCE_DIR = " << project->first("QMAKE_ABSOLUTE_SOURCE_PATH") << endl;
+
+
     if(!project->isEmpty("TARGET_SHORT"))
-        t << "QMAKE_PRL_TARGET = " << project->first("TARGET_SHORT") << endl;
-    else
-        t << "QMAKE_PRL_TARGET = " << target << endl;
+        t << "QMAKE_PRL_TARGET_SHORT = " << project->first("TARGET_SHORT") << endl;
+
     if(!project->isEmpty("PRL_EXPORT_DEFINES"))
         t << "QMAKE_PRL_DEFINES = " << project->values("PRL_EXPORT_DEFINES").join(" ") << endl;