# HG changeset patch
# User Eckhart Koeppen <eckhart.koppen@nokia.com>
# Date 1271830516 -10800
# Node ID 68d3b337861b2ac100ebe96edbf2a38d3efcb87b
# Parent  b5b118452c7df72e60313ba322a55d0bc967d186
bac24638cd0e032feaaaf81f375284a059242729

diff -r b5b118452c7d -r 68d3b337861b VERSION.SHA1
--- a/VERSION.SHA1	Mon Apr 19 10:15:19 2010 +0300
+++ b/VERSION.SHA1	Wed Apr 21 09:15:16 2010 +0300
@@ -1,1 +1,1 @@
-a8c775f23625952540b5349744722bcb9e37de45
+bac24638cd0e032feaaaf81f375284a059242729
diff -r b5b118452c7d -r 68d3b337861b confml/qtwebkit.confml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/confml/qtwebkit.confml	Wed Apr 21 09:15:16 2010 +0300
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2">
+	<confml:feature name="QTWebkit" ref="qtwebkit">
+		<confml:desc>QT Webkit settings</confml:desc>
+		<confml:setting name="QT Webkit enabled" 
+						ref="Enabled"
+						type="boolean">
+			<confml:desc>To enable QT Webkit usage</confml:desc>
+		</confml:setting>
+	</confml:feature>
+	<confml:data>
+		<confml:qtwebkit>
+			<confml:Enabled>true</confml:Enabled>
+		</confml:qtwebkit>
+	</confml:data>
+</confml:configuration>
\ No newline at end of file
diff -r b5b118452c7d -r 68d3b337861b content/apps/qtwebkit.sisx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/apps/qtwebkit.sisx	Wed Apr 21 09:15:16 2010 +0300
@@ -0,0 +1,1 @@
+1
\ No newline at end of file
diff -r b5b118452c7d -r 68d3b337861b content/apps/qtwebkit_stub.sis
Binary file content/apps/qtwebkit_stub.sis has changed
diff -r b5b118452c7d -r 68d3b337861b implml/qtwebkit_copy.implml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/implml/qtwebkit_copy.implml	Wed Apr 21 09:15:16 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container  xmlns="http://www.symbianfoundation.org/xml/implml/1"
+			condition="${qtwebkit.Enabled}">
+	<tag name="target" value="uda" />
+	<content xmlns="http://www.s60.com/xml/content/2">	  
+	  <output dir="sis" flatten="true">
+	    <input file="sis/qtwebkit.sisx" />
+	  </output>
+	</content>
+</container>
diff -r b5b118452c7d -r 68d3b337861b src/s60installs/deviceconfiguration/bld.inf
--- a/src/s60installs/deviceconfiguration/bld.inf	Mon Apr 19 10:15:19 2010 +0300
+++ b/src/s60installs/deviceconfiguration/bld.inf	Wed Apr 21 09:15:16 2010 +0300
@@ -53,6 +53,10 @@
 ../../../content/apps/qt.sisx               CRML_EXPORT_PATH(../content/sis/,uda_content)
 ../../../content/apps/qt_stub.sis          /epoc32/data/z/system/install/qt_stub.sis
 
+../../../confml/qtwebkit.confml                  CONFML_EXPORT_PATH(qtwebkit.confml,uda_content)
+../../../implml/qtwebkit_copy.implml             CRML_EXPORT_PATH(qtwebkit_copy.implml,uda_content)
+../../../content/apps/qtwebkit.sisx         CRML_EXPORT_PATH(../content/sis/,uda_content)
+../../../content/apps/qtwebkit_stub.sis    /epoc32/data/z/system/install/qtwebkit_stub.sis
 //tools
 ../../../bin/createpackage.bat         /epoc32/tools/createpackage.bat
 ../../../bin/createpackage.pl          /epoc32/tools/createpackage.pl
diff -r b5b118452c7d -r 68d3b337861b src/s60installs/qt.pkg
--- a/src/s60installs/qt.pkg	Mon Apr 19 10:15:19 2010 +0300
+++ b/src/s60installs/qt.pkg	Wed Apr 21 09:15:16 2010 +0300
@@ -1,12 +1,8 @@
-; Qt_template.pkg generated by qmake at 2009-11-16T11:44:16
-; This file is generated by qmake and should not be modified by the user
-;
-
 ; Language
 &EN
 
 ; SIS header: name, uid, version
-#{"Qt"},(0x2001E61C),4,6,2,TYPE=SA,RU
+#{"Qt"},(0x2001E61C),4,6,3,TYPE=SA,RU
 
 ; Manual PKG pre-rules from PRO files
 ; Default HW/platform dependencies
@@ -32,12 +28,11 @@
 "/epoc32/release/armv5/urel/QtTest.dll"    - "!:\sys\bin\QtTest.dll"
 "/epoc32/release/armv5/urel/QtSql.dll"    - "!:\sys\bin\QtSql.dll"
 "/epoc32/release/armv5/urel/QtSvg.dll"    - "!:\sys\bin\QtSvg.dll"
+"/epoc32/release/armv5/urel/phonon.dll"    - "!:\sys\bin\phonon.dll"
 "/epoc32/release/armv5/urel/QtScript.dll"    - "!:\sys\bin\QtScript.dll"
-"/epoc32/release/armv5/urel/QtWebKit.dll"    - "!:\sys\bin\QtWebKit.dll"
+"/epoc32/release/armv5/urel/QtXmlPatterns.dll"    - "!:\sys\bin\QtXmlPatterns.dll"
 "/epoc32/release/armv5/urel/QtOpenVG.dll"    - "!:\sys\bin\QtOpenVG.dll"
-"/epoc32/release/armv5/urel/phonon.dll"    - "!:\sys\bin\phonon.dll"
 "/epoc32/release/armv5/urel/QtMultimedia.dll"    - "!:\sys\bin\QtMultimedia.dll"
-"/epoc32/release/armv5/urel/QtXmlPatterns.dll"    - "!:\sys\bin\QtXmlPatterns.dll"
 
 "/epoc32/release/armv5/urel/qjpeg.dll"    - "!:\sys\bin\qjpeg.dll"
 "/sf/mw/qt/src/s60installs/qmakepluginstubs/qjpeg.qtplugin"    - "!:\resource\qt\plugins\imageformats\qjpeg.qtplugin"
@@ -74,8 +69,3 @@
 ELSE
  "/epoc32/release/armv5/urel/qts60plugin_5_0.dll" - "!:\sys\bin\qts60plugin_5_0.dll"
 ENDIF
-
-; EXISTS statement does not resolve !. Lets check the most common drives
-IF NOT EXISTS("c:\sys\bin\sqlite3.dll") AND NOT EXISTS("e:\sys\bin\sqlite3.dll") AND NOT EXISTS("z:\sys\bin\sqlite3.dll")
-"/epoc32/release/armv5/urel/sqlite3.dll" - "!:\sys\bin\sqlite3.dll"
-ENDIF
diff -r b5b118452c7d -r 68d3b337861b src/s60installs/qt_stub.pkg
--- a/src/s60installs/qt_stub.pkg	Mon Apr 19 10:15:19 2010 +0300
+++ b/src/s60installs/qt_stub.pkg	Wed Apr 21 09:15:16 2010 +0300
@@ -1,12 +1,8 @@
-; Qt_template.pkg generated by qmake at 2009-11-16T11:44:16
-; This file is generated by qmake and should not be modified by the user
-;
-
 ; Language
 &EN
 
 ; SIS header: name, uid, version
-#{"Qt"},(0x2001E61C),4,6,0,TYPE=SA
+#{"Qt"},(0x2001E61C),4,6,3,TYPE=SA,RU
 
 ; Localised Vendor name
 %{"Nokia, Qt"}
@@ -23,11 +19,13 @@
 "" - "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\QtWebKit.dll"
+"" - "Z:\sys\bin\QtXmlPatterns.dll"
 "" - "Z:\sys\bin\QtOpenVG.dll"
+"" - "Z:\sys\bin\QtMultimedia.dll"
+
 "" - "Z:\sys\bin\qjpeg.dll"
-"" - "Z:\sys\bin\phonon.dll"
 "" - "Z:\resource\qt\plugins\imageformats\qjpeg.qtplugin"
 
 "" - "Z:\sys\bin\qgif.dll"
@@ -59,7 +57,6 @@
 "" - "Z:\sys\bin\qts60plugin_5_0.dll"
 "" - "Z:\sys\bin\qts60plugin_3_2.dll"
 "" - "Z:\sys\bin\qts60plugin_3_1.dll"
-"" - "Z:\sys\bin\sqlite3.dll"
 
 
 
diff -r b5b118452c7d -r 68d3b337861b src/s60installs/qtwebkit.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/s60installs/qtwebkit.pkg	Wed Apr 21 09:15:16 2010 +0300
@@ -0,0 +1,28 @@
+; Language
+&EN
+
+; SIS header: name, uid, version
+#{"QtWebKit"},(0x200267C2),4,6,3,TYPE=SA,RU
+
+
+; Manual PKG pre-rules from PRO files
+; Default HW/platform dependencies
+[0x101F7961],0,0,0,{"S60ProductID"}
+[0x102032BE],0,0,0,{"S60ProductID"}
+[0x102752AE],0,0,0,{"S60ProductID"}
+[0x1028315F],0,0,0,{"S60ProductID"}
+ 
+; Default dependency to Qt libraries
+(0x2001E61C), 4, 6, 3, {"Qt"}
+; Localised Vendor name
+%{"Nokia, Qt"}
+ 
+; Unique Vendor name
+:"Nokia, Qt"
+ 
+
+; DEPLOYMENT
+"/epoc32/release/armv5/urel/QtWebKit.dll"    - "!:\sys\bin\QtWebKit.dll"
+
+; Manual PKG post-rules from PRO files
+
diff -r b5b118452c7d -r 68d3b337861b src/s60installs/qtwebkit_stub.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/s60installs/qtwebkit_stub.pkg	Wed Apr 21 09:15:16 2010 +0300
@@ -0,0 +1,19 @@
+; Language
+&EN
+
+; SIS header: name, uid, version
+#{"QtWebKit"},(0x200267C2),4,6,3,TYPE=SA,RU
+
+; Default dependency to Qt libraries
+(0x2001E61C), 4, 6, 3, {"Qt"}
+; Localised Vendor name
+%{"Nokia, Qt"}
+ 
+; Unique Vendor name
+:"Nokia, Qt"
+
+; DEPLOYMENT
+""    - "Z:\sys\bin\QtWebKit.dll"
+
+
+