# HG changeset patch
# User Brendan Donegan <brendand@symbian.org>
# Date 1276762854 -3600
# Node ID e5ad616daedbe8baac29d607cdf9292e6a73a891
# Parent  49affa6ecf2353ddc9ca31b25637d75aee2ba2cc
Last update to the Qt smoke tests

diff -r 49affa6ecf23 -r e5ad616daedb package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Thu Jun 17 09:20:54 2010 +0100
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="test" long-name="Smoke Test" levels="apps">
+      <block name="smoketest" level="test" long-name="Platform Smoketest" levels="tests">
+        <collection name="smoketest_collection" long-name="Smoketest Collection" level="test">
+		  <component name="tst_smoke_qtgestures" long-name="Qt Gestures Smoketest">
+            <unit bldFile="qt/gestures/bld.inf" proFile="qt/gestures/smoke_qtgestures.pro" />
+          </component>
+          <component name="tst_smoke_qwidget" long-name="Qt Widgets Smoketest">
+            <unit bldFile="qt/qwidget/bld.inf" proFile="qt/qwidget/smoke_qwidget.pro" />
+          </component>
+          <component name="tst_smoke_qapplication" long-name="Qt Application Smoketest">
+            <unit bldFile="qt/qapplication/bld.inf" proFile="qt/qapplication/smoke_qapplication.pro" />
+          </component>
+          <component name="smoketests" long-name="Smoketests">
+            <unit bldFile="Group/bld.inf"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 49affa6ecf23 -r e5ad616daedb qt/qwidget/smoke_qwidget.pro
--- a/qt/qwidget/smoke_qwidget.pro	Tue Jun 15 11:06:30 2010 +0100
+++ b/qt/qwidget/smoke_qwidget.pro	Thu Jun 17 09:20:54 2010 +0100
@@ -1,5 +1,5 @@
 load(qttest_p4)
-SOURCES  += smoketest_qwidget.cpp
+SOURCES  += smoke_qwidget.cpp
 RESOURCES     = qwidget.qrc
 
 contains(QT_CONFIG, qt3support): QT += qt3support