summaryrefslogtreecommitdiffstats
path: root/src/s60installs
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-06-07 10:07:39 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-06-07 10:07:39 (GMT)
commite35d63a791b554fe585a8ca47b905c36f5eea340 (patch)
tree20916e45847d2f71b8f32574d4abcf9158c66498 /src/s60installs
parentcafd332caee4ddfc724dc1271edd1cf69516f3cd (diff)
downloadQt-e35d63a791b554fe585a8ca47b905c36f5eea340.zip
Qt-e35d63a791b554fe585a8ca47b905c36f5eea340.tar.gz
Qt-e35d63a791b554fe585a8ca47b905c36f5eea340.tar.bz2
Fix the building of sis files.
Stuff goes into various subdirs, these should be specified too. Reviewed-By: axis
Diffstat (limited to 'src/s60installs')
-rw-r--r--src/s60installs/s60installs.pro10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 532269d..d3d9eed 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -151,9 +151,9 @@ symbian: {
contains(QT_CONFIG, declarative): {
qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtDeclarative$${QT_LIBINFIX}.dll
- folderlistmodelImport.sources = $$QMAKE_LIBDIR_QT/qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll
- gesturesImport.sources = $$QMAKE_LIBDIR_QT/qmlgesturesplugin$${QT_LIBINFIX}.dll
- particlesImport.sources = $$QMAKE_LIBDIR_QT/qmlparticlesplugin$${QT_LIBINFIX}.dll
+ folderlistmodelImport.sources = $$QT_BUILD_TREE/imports/Qt/labs/folderlistmodel/qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll
+ gesturesImport.sources = $$QT_BUILD_TREE/imports/Qt/labs/gestures/qmlgesturesplugin$${QT_LIBINFIX}.dll
+ particlesImport.sources = $$QT_BUILD_TREE/imports/Qt/labs/particles/qmlparticlesplugin$${QT_LIBINFIX}.dll
folderlistmodelImport.sources += $$QT_SOURCE_TREE/src/imports/folderlistmodel/qmldir
gesturesImport.sources += $$QT_SOURCE_TREE/src/imports/gestures/qmldir
@@ -166,11 +166,11 @@ symbian: {
DEPLOYMENT += folderlistmodelImport gesturesImport particlesImport
contains(QT_CONFIG, webkit): {
- webkitImport.sources = $$QMAKE_LIBDIR_QT/qmlwebkitplugin$${QT_LIBINFIX}.dll
+ webkitImport.sources = $$QT_BUILD_TREE/imports/org/webkit/qmlwebkitplugin$${QT_LIBINFIX}.dll
webkitImport.sources += $$QT_SOURCE_TREE/src/imports/webkit/qmldir
webkitImport.path = $$QT_IMPORTS_BASE_DIR/org/webkit
DEPLOYMENT += webkitImport
- }
+ }
}
graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems