diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-01 07:00:13 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-01 07:00:13 (GMT) |
| commit | 3dc0c38389670d6adddd972c532af98dd6b5deb5 (patch) | |
| tree | 779945938b51cc6290bc6dcee1cb34f696f42242 /src/s60installs/s60installs.pro | |
| parent | 73f0d9534b593c65e4facf9a975e2c2e63608f03 (diff) | |
| parent | f5feea56fc7202ab64a1b9c5f9b05391c2b88238 (diff) | |
| download | Qt-3dc0c38389670d6adddd972c532af98dd6b5deb5.zip Qt-3dc0c38389670d6adddd972c532af98dd6b5deb5.tar.gz Qt-3dc0c38389670d6adddd972c532af98dd6b5deb5.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/s60installs/s60installs.pro
Diffstat (limited to 'src/s60installs/s60installs.pro')
| -rwxr-xr-x[-rw-r--r--] | src/s60installs/s60installs.pro | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 0d257fb..d96b46a 100644..100755 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -134,19 +134,22 @@ symbian: { contains(QT_CONFIG, declarative): { qtlibraries.files += $$QMAKE_LIBDIR_QT/QtDeclarative$${QT_LIBINFIX}.dll - folderlistmodelImport.files = $$QT_BUILD_TREE/imports/Qt/labs/folderlistmodel/qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll - gesturesImport.files = $$QT_BUILD_TREE/imports/Qt/labs/gestures/qmlgesturesplugin$${QT_LIBINFIX}.dll - particlesImport.files = $$QT_BUILD_TREE/imports/Qt/labs/particles/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 + shadersImport.sources = $$QT_BUILD_TREE/imports/Qt/labs/shaders/qmlshadersplugin$${QT_LIBINFIX}.dll - folderlistmodelImport.files += $$QT_SOURCE_TREE/src/imports/folderlistmodel/qmldir - gesturesImport.files += $$QT_SOURCE_TREE/src/imports/gestures/qmldir - particlesImport.files += $$QT_SOURCE_TREE/src/imports/particles/qmldir + folderlistmodelImport.sources += $$QT_SOURCE_TREE/src/imports/folderlistmodel/qmldir + gesturesImport.sources += $$QT_SOURCE_TREE/src/imports/gestures/qmldir + particlesImport.sources += $$QT_SOURCE_TREE/src/imports/particles/qmldir + shadersImport.sources += $$QT_SOURCE_TREE/src/imports/shaders/qmldir 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 + shadersImport.path = c:$$QT_IMPORTS_BASE_DIR/Qt/labs/shaders - DEPLOYMENT += folderlistmodelImport gesturesImport particlesImport + DEPLOYMENT += folderlistmodelImport gesturesImport particlesImport shadersImport } graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems |