Changeset 1057 for trunk/src/imports

Timestamp:

Sep 6, 2011, 1:03:39 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

Rename qmldir to qmldir.in and use qmake substitution for plugin name.

This makes sure that the plugin filename always matches the TARGET
specification. This also makes the copy2build hassle unneeded.

This commit supersedes r1053.

Suggested by Rudi Ihle.

Location:

trunk/src/imports

Files:

• folderlistmodel/folderlistmodel.pro (modified) (2 diffs)
• folderlistmodel/qmldir.in (moved) (moved from trunk/src/imports/folderlistmodel/qmldir ) (1 diff)
• gestures/gestures.pro (modified) (2 diffs)
• gestures/qmldir.in (moved) (moved from trunk/src/imports/gestures/qmldir ) (1 diff)
• particles/particles.pro (modified) (2 diffs)
• particles/qmldir.in (moved) (moved from trunk/src/imports/particles/qmldir ) (1 diff)
• qimportbase.pri (modified) (2 diffs)

trunk/src/imports/folderlistmodel/folderlistmodel.pro

@@ -9 +9 @@
 HEADERS += qdeclarativefolderlistmodel.h
 
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-!isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
-else:qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
 symbian:{
     TARGET.UID3 = 0x20021320
@@ -25 +18 @@
     DEPLOYMENT = importFiles
 }
-
-INSTALLS += target qmldir

trunk/src/imports/folderlistmodel/qmldir.in

@@ -1 @@
-plugin qmlfolderlistmodelplugin
+plugin $$PLUGINFILENAME

trunk/src/imports/gestures/gestures.pro

@@ -9 +9 @@
 HEADERS += qdeclarativegesturearea_p.h
 
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-!isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
-else:qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
 symbian:{
     TARGET.UID3 = 0x2002131F
@@ -25 +18 @@
     DEPLOYMENT = importFiles
 }
-
-INSTALLS += target qmldir

trunk/src/imports/gestures/qmldir.in

@@ -1 @@
-plugin qmlgesturesplugin
+plugin $$PLUGINFILENAME

trunk/src/imports/particles/particles.pro

@@ -13 +13 @@
     qdeclarativeparticles_p.h
 
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-!isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
-else:qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
 symbian:{
     TARGET.UID3 = 0x2002131E
@@ -30 +23 @@
 }
 
-INSTALLS += target qmldir

trunk/src/imports/particles/qmldir.in

@@ -1 @@
-plugin qmlparticlesplugin
+plugin $$PLUGINFILENAME

trunk/src/imports/qimportbase.pri

@@ -12 +12 @@
 }
 
-QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
-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
-qmldir2build.CONFIG += no_clean
-QMAKE_EXTRA_COMPILERS += qmldir2build
+!isEmpty(TARGET_SHORT):PLUGINFILENAME = $$TARGET_SHORT
+else:PLUGINFILENAME = $$TARGET
+
+QMLDIRFILE.input = $${_PRO_FILE_PWD_}/qmldir.in
+QMLDIRFILE.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
+QMAKE_SUBSTITUTES += QMLDIRFILE
 
 TARGET = $$qtLibraryTarget($$TARGET)
@@ -38 +32 @@
     load(armcc_warnings)
 }
+
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
+target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+qmldir.files += $$QMLDIRFILE.output
+qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+INSTALLS += target qmldir