Changeset 965

Timestamp:

Aug 11, 2011, 5:50:43 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Add missing qtLibraryTarget() calls on TARGET_SHORT.

Location:

trunk

Files:

• examples/tools/plugandpaintplugins/basictools/basictools.pro (modified) (1 diff)
• src/3rdparty/webkit/WebCore/WebCore.pro (modified) (1 diff)
• src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro (modified) (1 diff)
• src/imports/qimportbase.pri (modified) (1 diff)
• tools/designer/src/plugins/plugins.pri (modified) (1 diff)

trunk/examples/tools/plugandpaintplugins/basictools/basictools.pro ¶

@@ -6 +6 @@
 SOURCES       = basictoolsplugin.cpp
 TARGET        = $$qtLibraryTarget(pnp_basictools)
-os2:TARGE     = $$qtLibraryTarget(pnp_bt)
+os2:TARGET    = $$qtLibraryTarget(pnp_bt)
 DESTDIR       = ../../plugandpaint/plugins
 #! [0]

trunk/src/3rdparty/webkit/WebCore/WebCore.pro ¶

@@ -2912 +2912 @@
     }
 
-    win32-*|wince* {
+    win32-*|wince*|os2 {
         DLLDESTDIR = $$OUTPUT_DIR/bin
         TARGET = $$qtLibraryTarget($$TARGET)
+        !isEmpty(TARGET_SHORT):TARGET_SHORT = $$qtLibraryTarget($$TARGET_SHORT)
 
         dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS]

trunk/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro ¶

@@ -24 +24 @@
 
 TARGET = $$qtLibraryTarget($$TARGET)
+!isEmpty(TARGET_SHORT):TARGET_SHORT = $$qtLibraryTarget($$TARGET_SHORT)
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 

trunk/src/imports/qimportbase.pri ¶

@@ -24 +24 @@
 
 TARGET = $$qtLibraryTarget($$TARGET)
+!isEmpty(TARGET_SHORT):TARGET_SHORT = $$qtLibraryTarget($$TARGET_SHORT)
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 

trunk/tools/designer/src/plugins/plugins.pri ¶

@@ -2 +2 @@
 win32|os2|mac: CONFIG+= debug_and_release
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
-contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET)
+contains(TEMPLATE, ".*lib") {
+    TARGET = $$qtLibraryTarget($$TARGET)
+    !isEmpty(TARGET_SHORT):TARGET_SHORT = $$qtLibraryTarget($$TARGET_SHORT)
+}
 
 # install