Changeset 1053 for trunk/src/imports/qimportbase.pri

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/imports/qimportbase.pri (modified) (1 diff)

trunk/src/imports/qimportbase.pri

@@ -13 +13 @@
 
 QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
-copy2build.input = QMLDIRFILE
-copy2build.output = $$QT_BUILD_TREE/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
+qmldir2build.input = QMLDIRFILE
+qmldir2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
+!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
 # `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
-copy2build.CONFIG += no_clean
-QMAKE_EXTRA_COMPILERS += copy2build
+qmldir2build.CONFIG += no_clean
+QMAKE_EXTRA_COMPILERS += qmldir2build
 
 TARGET = $$qtLibraryTarget($$TARGET)