summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-07-01 14:40:11 (GMT)
committeraxis <qt-info@nokia.com>2010-07-02 13:31:21 (GMT)
commite4616afabbdccdbd6f53e5c96086bd4065af9227 (patch)
tree0ff6535e0baa9c3ff0c5580abf8e92add7c95f67 /src/imports
parentf9dfd989197826c88f4d40e232fbbb040250f56f (diff)
downloadQt-e4616afabbdccdbd6f53e5c96086bd4065af9227.zip
Qt-e4616afabbdccdbd6f53e5c96086bd4065af9227.tar.gz
Qt-e4616afabbdccdbd6f53e5c96086bd4065af9227.tar.bz2
Fixed deployment locations for various profiles.
RevBy: Trust me
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/folderlistmodel/folderlistmodel.pro3
-rw-r--r--src/imports/gestures/gestures.pro3
-rw-r--r--src/imports/particles/particles.pro3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index 49a6baa..c306037 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -8,6 +8,7 @@ SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp
HEADERS += qdeclarativefolderlistmodel.h
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
+else:DESTDIR = .
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
qmldir.files += $$PWD/qmldir
@@ -17,7 +18,7 @@ symbian:{
TARGET.UID3 = 0x20021320
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- importFiles.sources = qmlfolderlistmodelplugin.dll qmldir
+ importFiles.sources = $$DESTDIR/qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir
importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
DEPLOYMENT = importFiles
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro
index 265bbca..8a772da 100644
--- a/src/imports/gestures/gestures.pro
+++ b/src/imports/gestures/gestures.pro
@@ -8,6 +8,7 @@ SOURCES += qdeclarativegesturearea.cpp plugin.cpp
HEADERS += qdeclarativegesturearea_p.h
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
+else:DESTDIR = .
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
qmldir.files += $$PWD/qmldir
@@ -17,7 +18,7 @@ symbian:{
TARGET.UID3 = 0x2002131F
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- importFiles.sources = qmlgesturesplugin.dll qmldir
+ importFiles.sources = $$DESTDIR/qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir
importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
DEPLOYMENT = importFiles
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index 91c1b9f..68462e7 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -12,6 +12,7 @@ HEADERS += \
qdeclarativeparticles_p.h
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
+else:DESTDIR = .
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
qmldir.files += $$PWD/qmldir
@@ -21,7 +22,7 @@ symbian:{
TARGET.UID3 = 0x2002131E
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- importFiles.sources = qmlparticlesplugin.dll qmldir
+ importFiles.sources = $$DESTDIR/qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir
importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
DEPLOYMENT = importFiles