diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-09 08:57:21 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-09 09:08:19 (GMT) |
| commit | b9696905fd62b5cf66392cd9f6757d4ae97a87db (patch) | |
| tree | 067d22399f900fed88088cc4fd2d9160f2bfe9c5 /src/s60installs | |
| parent | e56b1cc5e154801c0483a4fb31c125aee3382c48 (diff) | |
| download | Qt-b9696905fd62b5cf66392cd9f6757d4ae97a87db.zip Qt-b9696905fd62b5cf66392cd9f6757d4ae97a87db.tar.gz Qt-b9696905fd62b5cf66392cd9f6757d4ae97a87db.tar.bz2 | |
Tweak deployment rules after addition of OpenVG.
Ensure that we build the plugins we need and also clean up the file
a bit to remove the symbian specific blocks that aren't needed. Also
we no longer need a separate .iby file for deploying the VG graphics
system since it is now nicely integrated into Qt.
Diffstat (limited to 'src/s60installs')
| -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 |
3 files changed, 13 insertions, 10 deletions
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 |