diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-29 11:16:18 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-29 11:16:18 +0200 |
| commit | c09a6ac2f4b59fb786c69a20c63dea9f7f165d2c (patch) | |
| tree | ce1cf780931f72802cf506d27fecffaa49555d71 | |
| parent | ad8f90f98efdd7c7b76eaa164f505ae310f9998a (diff) | |
| parent | 58785e092d681d3d55361b9ec2e73c2f3d9ae65e (diff) | |
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1.0-integration
* '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia:
symbian: Disable sis packaging of declarative multimedia plugins
| -rw-r--r-- | src/s60installs/s60installs.pro | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index b5577db115..1713a644de 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -183,22 +183,26 @@ isEmpty(QT_LIBINFIX):symbian { pluginstubs += \ "IF package(0x20022E6D)" \ - "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/openmaxal/mediarecorder/qmakepluginstubs/qtmultimediakit_openmaxalengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_openmaxalengine.qtplugin\"" \ + "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/openmaxal/qmakepluginstubs/qtmultimediakit_openmaxalengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_openmaxalengine.qtplugin\"" \ "ENDIF" } pluginstubs += \ "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_mmfengine.qtplugin\"" \ "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/m3u/qmakepluginstubs/qtmultimediakit_m3u.qtplugin\" - \"!:\\resource\\qt\\plugins\\playlistformats\\qtmultimediakit_m3u.qtplugin\"" \ - - contains(QT_CONFIG, declarative): { - qtmobilitydeployment.sources += \ - $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_multimedia.dll - pluginstubs += \ - "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmakepluginstubs\\declarative_multimedia.qtplugin\" - \"!:\\resource\\qt\\imports\\Qt\\multimedia\\declarative_multimedia.qtplugin\"" - qmldirs += \ - "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmldir\" - \"!:\\resource\\qt\\imports\\Qt\\multimedia\\qmldir\"" - } + + +# Disabled: Not supported until mobility 1.1 +# See also commit f1a30766 +# +# contains(QT_CONFIG, declarative): { +# qtmobilitydeployment.sources += \ +# $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_multimedia.dll +# pluginstubs += \ +# "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmakepluginstubs\\declarative_multimedia.qtplugin\" - \"!:\\resource\\qt\\imports\\Qt\\multimedia\\declarative_multimedia.qtplugin\"" +# qmldirs += \ +# "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmldir\" - \"!:\\resource\\qt\\imports\\Qt\\multimedia\\qmldir\"" +# } } contains(mobility_modules, sensors) { |