Changeset 158 for trunk

Timestamp:

Sep 5, 2009, 2:46:05 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Added support for TARGET_SHORT variable that allows to specify a short name for the DLL target on DOS-like platforms.

Location:

trunk

Files:

• qmake/generators/makefile.cpp (modified) (1 diff)
• qmake/generators/os2/gnumake.cpp (modified) (1 diff)
• qmake/generators/win32/winmakefile.cpp (modified) (1 diff)
• src/plugins/qpluginbase.pri (modified) (1 diff)
• src/qbase.pri (modified) (1 diff)

trunk/qmake/generators/makefile.cpp

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -330 +330 @@
     project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
 
-    QString targetfilename = project->values("TARGET").first();
     QStringList &configs = project->values("CONFIG");
 

trunk/qmake/generators/win32/winmakefile.cpp

@@ -624 +624 @@
     if (orgDestDir.endsWith('/') || orgDestDir.endsWith(Option::dir_sep))
         destDir += Option::dir_sep;
-    QString target = QString(project->first("TARGET")+project->first("TARGET_EXT"));
+    QString target = project->first("TARGET_SHORT");
+    if (target.isEmpty())
+        target = project->first("TARGET");
+    target += project->first("TARGET_EXT");
     target.remove("\"");
     project->values("DEST_TARGET").prepend(destDir + target);

trunk/src/plugins/qpluginbase.pri

@@ -9 +9 @@
 win32|os2|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
 TARGET = $$qtLibraryTarget($$TARGET)
+
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 

trunk/src/qbase.pri

@@ -141 +141 @@
 
 TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
+
 
 moc_dir.name = moc_location