From ce99e07ec9e9805864d38eea076d1efa0c20b213 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 9 Jun 2010 15:58:38 +0300 Subject: Fixed DEPLOYMENT variable check in sis_targets.prf Checking just for count can fail when default_deployment is replaced with single custom deployment item. Reviewed-by: Janne Koskinen --- mkspecs/features/sis_targets.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index 13ee1ad..0023b54 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -1,5 +1,5 @@ # Sis file creation -contains(TEMPLATE, app)|!count(DEPLOYMENT, 1) { +contains(TEMPLATE, app)|!equals(DEPLOYMENT, default_deployment) { symbian-abld|symbian-sbsv2 { sis_destdir = make_cache_name = .make.cache -- cgit v0.12 From b1892130920981c099fc1800ef365cf4643c3382 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 9 Jun 2010 15:27:54 +0200 Subject: Fix Symbian install path for Qml plugins We force it to c: just as we do with all other Qt plugins Reviewed-by: Miikka Heikkinen --- src/s60installs/s60installs.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index d3d9eed..d751134 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -159,16 +159,16 @@ symbian: { gesturesImport.sources += $$QT_SOURCE_TREE/src/imports/gestures/qmldir particlesImport.sources += $$QT_SOURCE_TREE/src/imports/particles/qmldir - folderlistmodelImport.path = $$QT_IMPORTS_BASE_DIR/Qt/labs/folderlistmodel - gesturesImport.path = $$QT_IMPORTS_BASE_DIR/Qt/labs/gestures - particlesImport.path = $$QT_IMPORTS_BASE_DIR/Qt/labs/particles + folderlistmodelImport.path = c:$$QT_IMPORTS_BASE_DIR/Qt/labs/folderlistmodel + gesturesImport.path = c:$$QT_IMPORTS_BASE_DIR/Qt/labs/gestures + particlesImport.path = c:$$QT_IMPORTS_BASE_DIR/Qt/labs/particles DEPLOYMENT += folderlistmodelImport gesturesImport particlesImport contains(QT_CONFIG, webkit): { 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 + webkitImport.path = c:$$QT_IMPORTS_BASE_DIR/org/webkit DEPLOYMENT += webkitImport } } -- cgit v0.12