Enablers for the Qt eclipsing in Symbian

Remove file listing from the stub package file to ease maintenance,
generate stub sis from it and export it to the correct location to
be included into ROM.

Task-number: QT-4817
Reviewed-by: Guoqing Zhang
(cherry picked from commit 00b18457d5efb9224f3b066bab9e9f601fbcf543)

diff --git a/config.profiles/symbian/bld.inf b/config.profiles/symbian/bld.inf
index ddb5157..16a9e15 100644 (file)
--- a/config.profiles/symbian/bld.inf
+++ b/config.profiles/symbian/bld.inf
@@ -38,10 +38,12 @@ loc.prf                  /epoc32/tools/qt/mkspecs/features/loc.prf
 //For UDA image
 confml/qt.confml                  CONFML_EXPORT_PATH(qt.confml,uda_content)
 implml/qt_copy.implml             CRML_EXPORT_PATH(qt_copy.implml,uda_content)
-content/apps/qt.sisx               CRML_EXPORT_PATH(../content/sis/,uda_content)
-content/apps/qt_stub.sis          /epoc32/data/z/system/install/qt_stub.sis
+content/apps/qt.sisx              CRML_EXPORT_PATH(../content/sis/,uda_content)
 #endif
 
+/* export stub sis to enable eclipsing */
+qt_stub.sis                         /epoc32/data/z/system/install/qt_stub.sis
+
 //tools
 ../../bin/createpackage.bat         /epoc32/tools/createpackage.bat
 ../../bin/createpackage.pl          /epoc32/tools/createpackage.pl

diff --git a/config.profiles/symbian/qt_stub.pkg b/config.profiles/symbian/qt_stub.pkg
index dadf696..0ac4439 100644 (file)
--- a/config.profiles/symbian/qt_stub.pkg
+++ b/config.profiles/symbian/qt_stub.pkg
@@ -15,56 +15,3 @@
 ; Unique Vendor name
 :"Nokia, Qt"
 
-; Dependencies of Qt libraries
-
-"" - "z:\sys\bin\QtCore.dll"
-"" - "z:\sys\bin\QtXml.dll"
-"" - "z:\sys\bin\QtGui.dll"
-"" - "z:\sys\bin\QtNetwork.dll"
-"" - "z:\sys\bin\QtTest.dll"
-"" - "z:\sys\bin\QtSql.dll"
-"" - "z:\sys\bin\QtSvg.dll"
-"" - "z:\sys\bin\phonon.dll"
-"" - "z:\sys\bin\QtScript.dll"
-"" - "z:\sys\bin\QtXmlPatterns.dll"
-"" - "z:\sys\bin\QtDeclarative.dll"
-"" - "z:\sys\bin\QtOpenVG.dll"
-"" - "z:\sys\bin\QtOpenGL.dll"
-"" - "z:\sys\bin\QtMultimedia.dll"
-"" - "z:\private\10202D56\import\packages\2001E61C\backup_registration.xml"
-"" - "z:\sys\bin\qjpeg.dll"
-"" - "z:\resource\qt\plugins\imageformats\qjpeg.qtplugin"
-"" - "z:\sys\bin\qgif.dll"
-"" - "z:\resource\qt\plugins\imageformats\qgif.qtplugin"
-"" - "z:\sys\bin\qmng.dll"
-"" - "z:\resource\qt\plugins\imageformats\qmng.qtplugin"
-"" - "z:\sys\bin\qtiff.dll"
-"" - "z:\resource\qt\plugins\imageformats\qtiff.qtplugin"
-"" - "z:\sys\bin\qico.dll"
-"" - "z:\resource\qt\plugins\imageformats\qico.qtplugin"
-"" - "z:\sys\bin\qsvg.dll"
-"" - "z:\resource\qt\plugins\imageformats\qsvg.qtplugin"
-"" - "z:\sys\bin\qcncodecs.dll"
-"" - "z:\resource\qt\plugins\codecs\qcncodecs.qtplugin"
-"" - "z:\sys\bin\qjpcodecs.dll"
-"" - "z:\resource\qt\plugins\codecs\qjpcodecs.qtplugin"
-"" - "z:\sys\bin\qtwcodecs.dll"
-"" - "z:\resource\qt\plugins\codecs\qtwcodecs.qtplugin"
-"" - "z:\sys\bin\qkrcodecs.dll"
-"" - "z:\resource\qt\plugins\codecs\qkrcodecs.qtplugin"
-"" - "z:\sys\bin\qvggraphicssystem.dll"
-"" - "z:\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin"
-"" - "z:\sys\bin\qglgraphicssystem.dll"
-"" - "z:\resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplugin"
-"" - "z:\sys\bin\qsvgicon.dll"
-"" - "z:\resource\qt\plugins\iconengines\qsvgicon.qtplugin"
-"" - "z:\sys\bin\qmlfolderlistmodelplugin.dll"
-"" - "z:\resource\qt\imports\Qt\labs\folderlistmodel\qmlfolderlistmodelplugin.qtplugin"
-"" - "z:\resource\qt\imports\Qt\labs\folderlistmodel\qmldir"
-"" - "z:\sys\bin\qmlgesturesplugin.dll"
-"" - "z:\resource\qt\imports\Qt\labs\gestures\qmlgesturesplugin.qtplugin"
-"" - "z:\resource\qt\imports\Qt\labs\gestures\qmldir"
-"" - "z:\sys\bin\qmlparticlesplugin.dll"
-"" - "z:\resource\qt\imports\Qt\labs\particles\qmlparticlesplugin.qtplugin"
-"" - "z:\resource\qt\imports\Qt\labs\particles\qmldir"
-

diff --git a/config.profiles/symbian/qt_stub.sis b/config.profiles/symbian/qt_stub.sis
new file mode 100644 (file)
index 0000000..30d91a9
Binary files /dev/null and b/config.profiles/symbian/qt_stub.sis differ