Changeset 1053 for trunk/src/3rdparty

Timestamp:

Sep 5, 2011, 7:06:37 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Add support for short DLL names of QML plugins.

File:

• trunk/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro (modified) (2 diffs)

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

@@ -11 +11 @@
 
 QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
-copy2build.input = QMLDIRFILE
+2build.input = QMLDIRFILE
 CONFIG(QTDIR_build) {
-    copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
+    2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
 } else {
-    copy2build.output = $$OUTPUT_DIR/imports/$$TARGETPATH/qmldir
+    2build.output = $$OUTPUT_DIR/imports/$$TARGETPATH/qmldir
 }
-!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
-copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copy2build.name = COPY ${QMAKE_FILE_IN}
-copy2build.CONFIG += no_link
-QMAKE_EXTRA_COMPILERS += copy2build
+!contains(TEMPLATE_PREFIX, vc):qmldir2build.variable_out = PRE_TARGETDEPS
+!isEmpty(TARGET_SHORT):qmldir2build.depends = $(MAKEFILE) # this adds dependency on this .pri
+!isEmpty(TARGET_SHORT):qmldir2build.commands = $$QMAKE_COPY_QMLDIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} $$TARGET $$TARGET_SHORT
+else:qmldir2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+qmldir2build.name = COPY ${QMAKE_FILE_IN}
+qmldir2build.CONFIG += no_link
+QMAKE_EXTRA_COMPILERS += qmldir2build
 
 TARGET = $$qtLibraryTarget($$TARGET)
@@ -66 +68 @@
 
 
-qmldir.files += $$PWD/qmldir
+!isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
+else:qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH