From 89d7473e07712219c10bb6891894409caf32c8fa Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 17 Mar 2011 10:58:42 +0100 Subject: [PATCH] Switched to using QT.declaratice.imports variable. --- .../imports/folderlistmodel/folderlistmodel.pro | 2 +- qtdeclarative/src/imports/gestures/gestures.pro | 2 +- qtdeclarative/src/imports/particles/particles.pro | 2 +- qtdeclarative/src/imports/qimportbase.pri | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtdeclarative/src/imports/folderlistmodel/folderlistmodel.pro b/qtdeclarative/src/imports/folderlistmodel/folderlistmodel.pro index 44764a9..e55a5b2 100644 --- a/qtdeclarative/src/imports/folderlistmodel/folderlistmodel.pro +++ b/qtdeclarative/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/qtdeclarative/src/imports/gestures/gestures.pro b/qtdeclarative/src/imports/gestures/gestures.pro index ad872ba..8ebf9a0 100644 --- a/qtdeclarative/src/imports/gestures/gestures.pro +++ b/qtdeclarative/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/qtdeclarative/src/imports/particles/particles.pro b/qtdeclarative/src/imports/particles/particles.pro index 90b50e4..ba570f7 100644 --- a/qtdeclarative/src/imports/particles/particles.pro +++ b/qtdeclarative/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/qtdeclarative/src/imports/qimportbase.pri b/qtdeclarative/src/imports/qimportbase.pri index b0d2181..8647f05 100644 --- a/qtdeclarative/src/imports/qimportbase.pri +++ b/qtdeclarative/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} -- 1.7.3.2.343.g7d43d