diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 06:09:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 06:09:12 (GMT) |
| commit | 3e6a12e90d05d24bca68128d60215c207a416ef6 (patch) | |
| tree | d38e9c7e8a703c86a88cae5b7080db1c3bdb1057 /src/s60installs | |
| parent | 0599478b270ae277121a55c6040acc15edd4d6eb (diff) | |
| parent | 7adae4f0078fd9364081c66aa84431bf4a2108f5 (diff) | |
| download | Qt-3e6a12e90d05d24bca68128d60215c207a416ef6.zip Qt-3e6a12e90d05d24bca68128d60215c207a416ef6.tar.gz Qt-3e6a12e90d05d24bca68128d60215c207a416ef6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fix crash in direct show media service with mingw and a video surface.
Rebuild configure.exe with updated symbian media backend check.
Don't disable the symbian media backend.
Gstreamer media backend: fixed embedded qt build
S60 mediaservices backend
Fix qdoc error in low-level audio
When deployed on symbian, give player application the standard QT icon
update multimedia qml element doc samples
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/s60installs.pro | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index ad196a8..9826967 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -151,9 +151,15 @@ symbian: { graphicssystems_plugins.sources += $$QT_BUILD_TREE/plugins/graphicssystems/qvggraphicssystem$${QT_LIBINFIX}.dll } - contains(QT_CONFIG, multimedia) { + contains(QT_CONFIG, multimedia):contains(QT_CONFIG, mediaservices):contains(QT_CONFIG, media-backend) { qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMultimedia$${QT_LIBINFIX}.dll qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMediaServices$${QT_LIBINFIX}.dll + + mediaservices_plugins.path = c:$$QT_PLUGINS_BASE_DIR/mediaservices + mediaservices_plugins.sources += $$QT_BUILD_TREE/plugins/mediaservices/qmmfengine$${QT_LIBINFIX}.dll + + DEPLOYMENT += mediaservices_plugins + } BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)" |