diff options
| author | aavit <qt-info@nokia.com> | 2010-09-27 10:16:36 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-09-27 10:16:36 (GMT) |
| commit | 52e36c493d579323a09957028b0fd5ebc4d43021 (patch) | |
| tree | 20e2be544f034222250fa19a4e27e2ee37b958aa /src/imports/gestures/gestures.pro | |
| parent | c9a5ab5fd506663c5a7cd587d1b963c067d334bf (diff) | |
| parent | ce2a273bab9b9094a1f0f3f60309797e11e59404 (diff) | |
| download | Qt-52e36c493d579323a09957028b0fd5ebc4d43021.zip Qt-52e36c493d579323a09957028b0fd5ebc4d43021.tar.gz Qt-52e36c493d579323a09957028b0fd5ebc4d43021.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/imports/gestures/gestures.pro')
| -rw-r--r-- | src/imports/gestures/gestures.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 8a772da..18ffcb9 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -8,7 +8,6 @@ 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 @@ -18,7 +17,8 @@ symbian:{ TARGET.UID3 = 0x2002131F include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - importFiles.sources = $$DESTDIR/qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir + isEmpty(DESTDIR):importFiles.sources = qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir + else:importFiles.sources = $$DESTDIR/qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH DEPLOYMENT = importFiles |