diff options
| -rw-r--r-- | src/plugins/plugins.pro | 5 | ||||
| -rw-r--r-- | src/s60installs/qt.iby | 7 | ||||
| -rw-r--r-- | src/s60installs/qt_libs.pro | 7 | ||||
| -rw-r--r-- | src/s60installs/qtvggraphicssystem.iby | 9 |
4 files changed, 15 insertions, 13 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index c08056e..a8981db 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,13 +1,12 @@ TEMPLATE = subdirs SUBDIRS *= accessible imageformats sqldrivers iconengines script -unix { +unix:!symbian { contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs } else { SUBDIRS *= codecs } !embedded:SUBDIRS *= graphicssystems embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers -!win32:!embedded:!mac:SUBDIRS *= inputmethods +!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods contains(QT_CONFIG, phonon): SUBDIRS *= phonon -symbian:SUBDIRS = imageformats codecs iconengines s60 sqldrivers diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby index 79edc56..8a0e03c 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 @@ -70,6 +71,9 @@ file=ABI_DIR\BUILD_DIR\qtwcodecs.dll SHARED_LIB_DIR\qtwcodecs.dll PAG // iconengines file=ABI_DIR\BUILD_DIR\qsvgicon.dll SHARED_LIB_DIR\qsvgicon.dll PAGED +// graphicssystems +file=ABI_DIR\BUILD_DIR\qvggraphicssystem.dll SHARED_LIB_DIR\qvggraphicssystem.dll PAGED + S60_APP_RESOURCE(s60main) // imageformats stubs @@ -89,6 +93,9 @@ data=\epoc32\winscw\c\resource\qt\plugins\codecs\qtwcodecs.qtplugin res // iconengines stubs data=\epoc32\winscw\c\resource\qt\plugins\iconengines\qsvgicon.qtplugin resource\qt\plugins\iconengines\qsvgicon.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 diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro index e9da90d..47e4818 100644 --- a/src/s60installs/qt_libs.pro +++ b/src/s60installs/qt_libs.pro @@ -69,7 +69,12 @@ symbian: { qtlibraries.sources += Phonon.dll } + graphicssystems_plugins.path = $$QT_PLUGINS_BASE_DIR/graphicssystems + contains(QT_CONFIG, openvg) { + qtlibraries.sources = QtOpenVG.dll + graphicssystems_plugins.sources += qvggraphicssystem.dll + } + BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)" - BLD_INF_RULES.prj_exports += "qtvggraphicssystem.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qtvggraphicssystem.iby)" BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CORE_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)" } diff --git a/src/s60installs/qtvggraphicssystem.iby b/src/s60installs/qtvggraphicssystem.iby deleted file mode 100644 index 6aec404..0000000 --- a/src/s60installs/qtvggraphicssystem.iby +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef QTVGGRAPHICSSYSTEM_IBY -#define QTVGGRAPHICSSYSTEM_IBY - -#include <qt.iby> - -file=ABI_DIR\BUILD_DIR\qvggraphicssystem.dll qvggraphicssystem.dll -data=\epoc32\winscw\c\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin - -#endif // QTVGGRAPHICSSYSTEM_IBY |