diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 18:04:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 18:04:43 (GMT) |
| commit | c82d7010aa6c9cfa993e771f9953b70ae1fdb6a9 (patch) | |
| tree | 137194ea2e4253a20278cd49283b3aa57a0aff04 | |
| parent | 9bf0037c09fb08f84d2a70a072b1356e8a41c25e (diff) | |
| parent | 47b03704fd906ec95dfab920d2db20726fd91700 (diff) | |
| download | Qt-c82d7010aa6c9cfa993e771f9953b70ae1fdb6a9.zip Qt-c82d7010aa6c9cfa993e771f9953b70ae1fdb6a9.tar.gz Qt-c82d7010aa6c9cfa993e771f9953b70ae1fdb6a9.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:
Take phonon backend back in qt.iby
| -rw-r--r-- | src/s60installs/qt.iby | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby index 3a094a3..d6b36e0 100644 --- a/src/s60installs/qt.iby +++ b/src/s60installs/qt.iby @@ -39,11 +39,8 @@ file=ABI_DIR\BUILD_DIR\qtwcodecs.dll SHARED_LIB_DIR\qtwcodecs.dll file=ABI_DIR\BUILD_DIR\qsvgicon.dll SHARED_LIB_DIR\qsvgicon.dll // Phonon MMF backend -// This is commented out by default, as normally Helix backend will be used. -// If the Helix backend is present, it will override MMF backend, so make sure to remove it from -// image creation in addition to uncommenting the following lines if you want to use MMF backend. -//file=ABI_DIR\BUILD_DIR\phonon_mmf.dll SHARED_LIB_DIR\phonon_mmf.dll -//data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin +file=ABI_DIR\BUILD_DIR\phonon_mmf.dll SHARED_LIB_DIR\phonon_mmf.dll +data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin // graphicssystems file=ABI_DIR\BUILD_DIR\qvggraphicssystem.dll SHARED_LIB_DIR\qvggraphicssystem.dll |