# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284701658 -10800
# Node ID ef0373b551364fdb8eaff76fa076f14cb01a7560
# Parent  a33bf25e6f725b91ebeea16a6d5d1faf1c7b7fd9
Revision: 201035
Kit: 201037

diff -r a33bf25e6f72 -r ef0373b55136 package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Fri Sep 17 08:34:18 2010 +0300
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+	<!-- qt:qmakeArgs attribute is an unsupported extension used as temporary hack to get this to work with abld.
+		This will be removed when sbsv2 builds are working -->
+  <package id="qt" name="Qt" levels="tool mw app">
+    <collection id="qtconf" name="Qt Config" level="tool">
+            <component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="s60,qt_tools" introduced="^2">
+                <unit bldFile="src/s60installs/deviceconfiguration"/>
+            </component>
+    </collection>
+    <collection id="qt_info" name="Qt Info" level="mw">
+            <component id="qt_build" name="Qt Build" introduced="^2" filter="s60">
+  		        <unit bldFile="." qt:proFile="projects.pro"/>
+            </component>
+    </collection>
+    <collection id="qtdemos" name="Qt Demos" level="app">
+            <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="s60,test,qtdemos,build_as_app">
+			  <meta rel="testbuild">
+			   <group name="qtdemos"/>
+			  </meta>
+                <unit bldFile="demos" qt:proFile="demos.pro"/>
+            </component>
+    </collection>
+    <collection id="qtexamples" name="Qt Examples" level="app">
+			  <meta rel="qtexamples">
+			   <group name="qtdemos"/>
+			  </meta>
+            <component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="s60,test,qtexamples,build_as_app">
+                <unit bldFile="examples" qt:proFile="examples.pro"/>
+            </component>
+    </collection>
+    <collection id="qt_tests" name="Qt Tests" level="app">
+            <component id="qttestsauto" name="Qt Automated Tests" introduced="^2" filter="s60,qttestsauto,test,build_as_app">
+				  <meta rel="qttestsauto">
+				   <group name="qtdemos"/>
+				  </meta>
+                <unit bldFile="tests/auto" qt:proFile="qtpauto.pro"/>
+            </component>
+            <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="s60,qttestsbenchmarks,test,build_as_app">
+				  <meta rel="testbuild">
+				   <group name="qttestsbenchmarks"/>
+				  </meta>
+                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro"/>
+            </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r a33bf25e6f72 -r ef0373b55136 package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Fri Sep 17 08:34:18 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>
diff -r a33bf25e6f72 -r ef0373b55136 src/s60installs/deviceconfiguration/bld.inf
--- a/src/s60installs/deviceconfiguration/bld.inf	Thu Sep 02 21:20:32 2010 +0300
+++ b/src/s60installs/deviceconfiguration/bld.inf	Fri Sep 17 08:34:18 2010 +0300
@@ -47,5 +47,5 @@
 PRJ_EXTENSIONS
 START EXTENSION qt/qtconfig
 OPTION QT_ROOT ..
-OPTION OPTIONS -opensource -confirm-license -openvg -script -no-scripttools -webkit -make make -graphicssystem openvg -no-phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools
+OPTION OPTIONS -opensource -confirm-license -openvg -script -no-scripttools -no-webkit -make make -graphicssystem openvg -no-phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools
 END