diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-07-21 04:18:57 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-07-21 04:18:57 (GMT) |
| commit | 6b1487b5df04e30b92a2639340928d64c08cb72f (patch) | |
| tree | 8109961850f82c76b1b6fd4967dde78259ced21f /src/s60installs/qt.iby | |
| parent | 127c93b8ab606740fa9c59de9ce6d10de91af412 (diff) | |
| parent | 9324fddeb081a5f1cef9229d15a7799df17d02fa (diff) | |
| download | Qt-6b1487b5df04e30b92a2639340928d64c08cb72f.zip Qt-6b1487b5df04e30b92a2639340928d64c08cb72f.tar.gz Qt-6b1487b5df04e30b92a2639340928d64c08cb72f.tar.bz2 | |
Merge commit 'origin/master' into topic/mmfphonon
Conflicts:
src/plugins/plugins.pro
src/s60installs/qt.iby
Diffstat (limited to 'src/s60installs/qt.iby')
| -rw-r--r-- | src/s60installs/qt.iby | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby index edd0ab2..c76f4c9 100644 --- a/src/s60installs/qt.iby +++ b/src/s60installs/qt.iby @@ -47,6 +47,7 @@ BINARY_SELECTION_ORDER ARMV6,ARMV5 // hack - this really needs to be at the base file=ABI_DIR\BUILD_DIR\QtCore.dll SHARED_LIB_DIR\QtCore.dll PAGED file=ABI_DIR\BUILD_DIR\QtGui.dll SHARED_LIB_DIR\QtGui.dll PAGED file=ABI_DIR\BUILD_DIR\QtOpenGL.dll SHARED_LIB_DIR\QtOpenGL.dll PAGED +file=ABI_DIR\BUILD_DIR\QtOpenVG.dll SHARED_LIB_DIR\QtOpenVG.dll PAGED file=ABI_DIR\BUILD_DIR\QtSvg.dll SHARED_LIB_DIR\QtSvg.dll PAGED file=ABI_DIR\BUILD_DIR\QtXml.dll SHARED_LIB_DIR\QtXml.dll PAGED file=ABI_DIR\BUILD_DIR\QtNetwork.dll SHARED_LIB_DIR\QtNetwork.dll PAGED @@ -73,6 +74,9 @@ file=ABI_DIR\BUILD_DIR\qsvgicon.dll SHARED_LIB_DIR\qsvgicon.dll PAG // Phonon MMF backend file=ABI_DIR\BUILD_DIR\phonon_mmf.dll SHARED_LIB_DIR\phonon_mmf.dll PAGED +// graphicssystems +file=ABI_DIR\BUILD_DIR\qvggraphicssystem.dll SHARED_LIB_DIR\qvggraphicssystem.dll PAGED + S60_APP_RESOURCE(s60main) // imageformats stubs @@ -95,6 +99,9 @@ data=\epoc32\winscw\c\resource\qt\plugins\iconengines\qsvgicon.qtplugin res // Phonon MMF backend data=\epoc32\winscw\c\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin +// graphicssystems +data=\epoc32\winscw\c\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin + // Stub sis file data=ZSYSTEM\install\qt.sis System\Install\qt.sis |