diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-06-30 14:31:07 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-06-30 14:35:11 (GMT) |
| commit | 1614f30732ff417a8dc7ea89fcfb4a724ece6109 (patch) | |
| tree | 12a6aee305de6cd21bf198850757adadf069589f | |
| parent | 7168aebb1b452b6f22a35be5ae31ccdc3e3e23df (diff) | |
| download | Qt-1614f30732ff417a8dc7ea89fcfb4a724ece6109.zip Qt-1614f30732ff417a8dc7ea89fcfb4a724ece6109.tar.gz Qt-1614f30732ff417a8dc7ea89fcfb4a724ece6109.tar.bz2 | |
The qmlshadersplugin deployment must be scoped same as its building
The check "contains(QT_CONFIG, opengl)" is used to include shaders
subdir, so the same check needs to be used when defining deployment
for shaders in s60installs.pro
Task-number: QTBUG-20192
Reviewed-by: TrustMe
| -rwxr-xr-x | src/s60installs/s60installs.pro | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 573e585..9a34227 100755 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -150,19 +150,23 @@ 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 shadersImport + DEPLOYMENT += folderlistmodelImport gesturesImport particlesImport + + contains(QT_CONFIG, opengl) { + shadersImport.sources = $$QT_BUILD_TREE/imports/Qt/labs/shaders/qmlshadersplugin$${QT_LIBINFIX}.dll \ + $$QT_SOURCE_TREE/src/imports/shaders/qmldir + shadersImport.path = c:$$QT_IMPORTS_BASE_DIR/Qt/labs/shaders + DEPLOYMENT += shadersImport + } } graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems |