diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-09 16:06:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-09 16:06:12 (GMT) |
| commit | 80cbb6adaa134447469fde80076a8ec57ef00960 (patch) | |
| tree | bf2955bdbb279ed882535e1af60b2cf18c77d6c9 | |
| parent | e7dad7eb61399d06916b1ee803ad995272c760cb (diff) | |
| parent | b1892130920981c099fc1800ef365cf4643c3382 (diff) | |
| download | Qt-80cbb6adaa134447469fde80076a8ec57ef00960.zip Qt-80cbb6adaa134447469fde80076a8ec57ef00960.tar.gz Qt-80cbb6adaa134447469fde80076a8ec57ef00960.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix Symbian install path for Qml plugins
Fixed DEPLOYMENT variable check in sis_targets.prf
| -rw-r--r-- | mkspecs/features/sis_targets.prf | 2 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 8 |
2 files changed, 5 insertions, 5 deletions
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 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 } } |