IBY files for adding Qt into ROM

RevBy: jbarron

5 files changed, 163 insertions, 2 deletions

diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf
index 334f1e9..31ba09e 100644
--- a/mkspecs/features/symbian/platform_paths.prf
+++ b/mkspecs/features/symbian/platform_paths.prf
@@ -223,7 +223,27 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
 
         OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility)
 
-
+        # ---------------------------------------
+        # Definitions to export IBY files to different folders where they will be taken 
+        # to ROM image
+        # ---------------------------------------
+              
+        defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/app/$$1)
+        }
+        defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/mw/$$1)
+        }
+        defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/os/$$1)
+        }
+        defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/os/$$1)
+        }
+        defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/$$1)
+        }
+        
         # You need to define the following in pro-file, if you are using the stllib:
         # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
         # DEFINES *= $$STLLIB_USAGE_DEFINES
@@ -402,7 +422,27 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
 
         OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility)
 
-
+        # ---------------------------------------
+        # Definitions to export IBY files to different folders where they will be taken 
+        # to ROM image
+        # ---------------------------------------
+              
+        defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/app/$$1)
+        }
+        defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/mw/$$1)
+        }
+        defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/osext/$$1)
+        }
+        defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/core/osext/$$1)
+        }
+        defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
+            return(/epoc32/rom/include/$$1)
+        }
+        
         # You need to define the following in pro-file, if you are using the stllib:
         # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
         # DEFINES *= $$STLLIB_USAGE_DEFINES
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby
new file mode 100644
index 0000000..dc702f9
--- /dev/null
+++ b/src/s60installs/qt.iby
@@ -0,0 +1,94 @@
+#ifndef QT_IBY
+#define QT_IBY
+
+#include <bldvariant.hrh>
+
+// Dependancies for more than one module
+#include <base.iby>
+#include <openenv.iby> // QtCore, QtGui, QtNetwork, QtOpenGL, QSvgIconEngine, 
+#include <cone.iby> // QtGui, QtOpenGL
+
+// QtGui dependancies
+#include <bafl.iby>
+#include <store.iby>
+#include <fntstore.iby>
+#include <ecom.iby>
+#include <fontutils.iby>
+#include <fepbase.iby>
+#include <fbserv.iby>
+#include <bitgdi.iby>
+#include <gdi.iby>
+#include <wserv.iby>
+#include <apparc.iby>
+#include <uikon.iby>
+#include <etext.iby>
+#include <emime.iby>
+#include <eikstd.iby>
+#include <mmf.iby>
+#include <avkon.iby>
+#include <commonui.iby>
+#include <platformenv.iby>
+#include <senduiservices.iby>
+#include <aknicon.iby>
+#include <aknskins.iby>
+
+// QtNetwork dependancies
+#include <esock_core.iby>
+#include <insock.iby>
+
+// QtOpenGL dependancies
+///@todo Problem here as we need libegl.dll and libglesv2.dll but they may come from a variety of places
+/// depending on the platform we're on
+
+#warning("qt.iby: hack - BINARY_SELECTION_ORDER really needs to be at the baseport/device level as it depends on the device type");
+BINARY_SELECTION_ORDER ARMV6,ARMV5 // hack - this really needs to be at the baseport/device level as it depends on the device type
+
+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\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
+file=ABI_DIR\BUILD_DIR\QtScript.dll          SHARED_LIB_DIR\QtScript.dll     PAGED
+file=ABI_DIR\BUILD_DIR\QtTest.dll            SHARED_LIB_DIR\QtTest.dll       PAGED
+
+// imageformats
+file=ABI_DIR\BUILD_DIR\qgif.dll              SHARED_LIB_DIR\qgif.dll         PAGED
+file=ABI_DIR\BUILD_DIR\qico.dll              SHARED_LIB_DIR\qico.dll         PAGED
+file=ABI_DIR\BUILD_DIR\qjpeg.dll             SHARED_LIB_DIR\qjpeg.dll        PAGED
+file=ABI_DIR\BUILD_DIR\qmng.dll              SHARED_LIB_DIR\qmng.dll         PAGED
+file=ABI_DIR\BUILD_DIR\qsvg.dll              SHARED_LIB_DIR\qsvg.dll         PAGED
+file=ABI_DIR\BUILD_DIR\qtiff.dll             SHARED_LIB_DIR\qtiff.dll        PAGED
+
+// codecs
+file=ABI_DIR\BUILD_DIR\qcncodecs.dll         SHARED_LIB_DIR\qcncodecs.dll    PAGED
+file=ABI_DIR\BUILD_DIR\qjpcodecs.dll         SHARED_LIB_DIR\qjpcodecs.dll    PAGED
+file=ABI_DIR\BUILD_DIR\qkrcodecs.dll         SHARED_LIB_DIR\qkrcodecs.dll    PAGED
+file=ABI_DIR\BUILD_DIR\qtwcodecs.dll         SHARED_LIB_DIR\qtwcodecs.dll    PAGED
+
+// iconengines
+file=ABI_DIR\BUILD_DIR\qsvgicon.dll          SHARED_LIB_DIR\qsvgicon.dll     PAGED
+
+S60_APP_RESOURCE(s60main)
+
+// imageformats stubs
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qgif.qtplugin         resource\qt\plugins\imageformats\qgif.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qico.qtplugin         resource\qt\plugins\imageformats\qico.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qjpeg.qtplugin        resource\qt\plugins\imageformats\qjpeg.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qmng.qtplugin         resource\qt\plugins\imageformats\qmng.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qsvg.qtplugin         resource\qt\plugins\imageformats\qsvg.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\imageformats\qtiff.qtplugin        resource\qt\plugins\imageformats\qtiff.qtplugin
+
+// codecs stubs
+data=\epoc32\winscw\c\resource\qt\plugins\codecs\qcncodecs.qtplugin          resource\qt\plugins\codecs\qcncodecs.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\codecs\qjpcodecs.qtplugin          resource\qt\plugins\codecs\qjpcodecs.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\codecs\qkrcodecs.qtplugin          resource\qt\plugins\codecs\qkrcodecs.qtplugin
+data=\epoc32\winscw\c\resource\qt\plugins\codecs\qtwcodecs.qtplugin          resource\qt\plugins\codecs\qtwcodecs.qtplugin
+
+// iconengines stubs
+data=\epoc32\winscw\c\resource\qt\plugins\iconengines\qsvgicon.qtplugin      resource\qt\plugins\iconengines\qsvgicon.qtplugin
+
+// Stub sis file
+data=ZSYSTEM\install\qt.sis    System\Install\qt.sis
+
+#endif // __QT_IBY__
diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro
index 064d6a5..99fde62 100644
--- a/src/s60installs/qt_libs.pro
+++ b/src/s60installs/qt_libs.pro
@@ -69,4 +69,7 @@ symbian: {
     	qtlibraries.sources += QtPhonon.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/qtdemoapps.iby b/src/s60installs/qtdemoapps.iby
new file mode 100644
index 0000000..d888135
--- /dev/null
+++ b/src/s60installs/qtdemoapps.iby
@@ -0,0 +1,15 @@
+#ifndef QTDEMOAPPS_IBY
+#define QTDEMOAPPS_IBY
+
+// A subset of Qt demo & example applications
+
+// Note that star requires OpenVG and the Qt OpenVG paint engine
+S60_APP_EXE(star)
+S60_APP_RESOURCE(star)
+data=\epoc32\data\Z\private\10003a3f\import\Apps\star_reg.rsc   \private\10003a3f\import\apps\star_reg.rsc
+
+S60_APP_EXE(wiggly)
+S60_APP_RESOURCE(wiggly)
+data=\epoc32\data\Z\private\10003a3f\import\Apps\wiggly_reg.rsc   \private\10003a3f\import\apps\wiggly_reg.rsc
+
+#endif // QTDEMOAPPS_IBY
diff --git a/src/s60installs/qtvggraphicssystem.iby b/src/s60installs/qtvggraphicssystem.iby
new file mode 100644
index 0000000..6aec404
--- /dev/null
+++ b/src/s60installs/qtvggraphicssystem.iby
@@ -0,0 +1,9 @@
+#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