summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-09-24 11:18:33 +0200
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-09-24 11:50:00 +0200
commitce0dfd10fda1b5c69f31fbf1dd4e85e99b4fd1ac (patch)
tree999f1bd9d14e41d5abaeddc309f9eaf892d712ed
parent56a6cd1a70198eb57589fbfa280b425eeaec2286 (diff)
Fixed gestures.pro project file
We don't need to set DESTDIR to the current directory. Doing this shows a make error because it tries to move the file from the current directory to the current directory. Reviewed-by: axis
-rw-r--r--gestures.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/gestures.pro b/gestures.pro
index ed34ba7..714a08c 100644
--- a/gestures.pro
+++ b/gestures.pro
@@ -15,7 +15,6 @@ HEADERS += qdeclarativegesturearea_p.h \
qdeclarativegesturerecognizers_p.h
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
-else:DESTDIR = .
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
qmldir.files += $$PWD/qmldir
@@ -26,7 +25,8 @@ symbian:{
TARGET.EPOCALLOWDLLDATA = 1
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- importFiles.sources = $$DESTDIR/qmlgestureareaplugin$${QT_LIBINFIX}.dll qmldir
+ isEmpty(DESTDIR):importFiles.sources = qmlgestureareaplugin$${QT_LIBINFIX}.dll qmldir
+ else:importFiles.sources = $$DESTDIR/qmlgestureareaplugin$${QT_LIBINFIX}.dll qmldir
importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
DEPLOYMENT = importFiles