diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-29 07:50:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-29 07:50:00 (GMT) |
| commit | 6469ed030a0edbb08b7856c9292fcceb155dff86 (patch) | |
| tree | b826bb9f4aa5ee42ad62e2d1a3000dc3ed6ea693 | |
| parent | 993caa169260dadf08e98824bf851628d05c739b (diff) | |
| parent | 177f466bc581f8ad5bd4e883e8bc342a0b6c7484 (diff) | |
| download | Qt-6469ed030a0edbb08b7856c9292fcceb155dff86.zip Qt-6469ed030a0edbb08b7856c9292fcceb155dff86.tar.gz Qt-6469ed030a0edbb08b7856c9292fcceb155dff86.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:
Added qmlshadersplugin to Symbian s60installs.pro-file.
| -rwxr-xr-x[-rw-r--r--] | src/s60installs/s60installs.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 17b229f..573e585 100644..100755 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -150,16 +150,19 @@ symbian: { 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.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 |