diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-09-24 09:45:16 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-09-24 09:46:32 (GMT) |
| commit | c95ce0b015bbad0b9f4b78ace01cfacff2ebb4c1 (patch) | |
| tree | bd5283f66b9a774b86eacedbf717b3e0025963d0 /src/imports/gestures | |
| parent | c52224f8010bf90732e5b2ad6cef84f9bd248787 (diff) | |
| download | Qt-c95ce0b015bbad0b9f4b78ace01cfacff2ebb4c1.zip Qt-c95ce0b015bbad0b9f4b78ace01cfacff2ebb4c1.tar.gz Qt-c95ce0b015bbad0b9f4b78ace01cfacff2ebb4c1.tar.bz2 | |
Do not set DESTDIR to the current directory
Setting DESTDIR=. shows an error from mv trying to move the file from
the current directory to the same current directory.
Reviewed-by: axis
Diffstat (limited to 'src/imports/gestures')
| -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 |