diff options
| author | axis <qt-info@nokia.com> | 2011-03-17 10:58:42 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:06:00 +0200 |
| commit | 74d634606d80045c90a80de285cf4a731dc06fb4 (patch) | |
| tree | 723612cfa07a9bb503acea7de78dae97a9969102 | |
| parent | 0cc1c664bdf5f878d47b51e3a2a19e8a1a1c706d (diff) | |
Switched to using QT.declaratice.imports variable.
| -rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro | 2 | ||||
| -rw-r--r-- | src/imports/gestures/gestures.pro | 2 | ||||
| -rw-r--r-- | src/imports/particles/particles.pro | 2 | ||||
| -rw-r--r-- | src/imports/qimportbase.pri | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 44764a91a2..e55a5b2a29 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -7,7 +7,7 @@ QT += declarative script SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp HEADERS += qdeclarativefolderlistmodel.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index ad872bae3f..8ebf9a02f8 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -7,7 +7,7 @@ QT += declarative SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 90b50e4659..ba570f77a3 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -11,7 +11,7 @@ SOURCES += \ HEADERS += \ qdeclarativeparticles_p.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index b0d2181786..8647f05cb9 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -15,7 +15,7 @@ isEmpty(TARGET) { QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE -copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir +copy2build.output = $$QT.declarative.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} |