summaryrefslogtreecommitdiffstats
path: root/src/imports/particles
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-10-25 12:56:51 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-10-25 12:56:51 (GMT)
commitbd0258ed73ecee28fba4c21027b2c2afd1b6af39 (patch)
tree136e780c13e0019382a315758d20e8ea43cf1c2d /src/imports/particles
parentcb4eb590d4af9978a0d60402f3c4ab99b6f4ede4 (diff)
parentec6543371108bbe24fb8d98eb1ff057c641a0e9d (diff)
downloadQt-bd0258ed73ecee28fba4c21027b2c2afd1b6af39.zip
Qt-bd0258ed73ecee28fba4c21027b2c2afd1b6af39.tar.gz
Qt-bd0258ed73ecee28fba4c21027b2c2afd1b6af39.tar.bz2
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts: src/corelib/kernel/qeventdispatcher_symbian.cpp src/declarative/qml/qdeclarativetypeloader.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/opengl/qgl.cpp src/opengl/qgl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qclipboard/test/test.pro tests/auto/qsound/qsound.pro
Diffstat (limited to 'src/imports/particles')
-rw-r--r--src/imports/particles/particles.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index 90b50e4..894d164 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -23,8 +23,8 @@ symbian:{
isEmpty(DESTDIR):importFiles.files = qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir
else:importFiles.files = $$DESTDIR/qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir
importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
-
- DEPLOYMENT = importFiles
+
+ DEPLOYMENT += importFiles
}
INSTALLS += target qmldir