summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/states/data
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-23 01:12:19 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-23 01:12:19 (GMT)
commit60e39093e9bd76b88027863d60873bc82492be50 (patch)
tree1f05a97da1722eb5f83700f3fd897b8a1290ffd8 /tests/auto/declarative/states/data
parentb316de95032216a90a8262cce3708f781f8ccbd9 (diff)
parent831d30af205d5125f762696bb6f9a5f9d1e3c5f5 (diff)
downloadQt-60e39093e9bd76b88027863d60873bc82492be50.zip
Qt-60e39093e9bd76b88027863d60873bc82492be50.tar.gz
Qt-60e39093e9bd76b88027863d60873bc82492be50.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative/states/data')
-rw-r--r--tests/auto/declarative/states/data/deleting.qml11
-rw-r--r--tests/auto/declarative/states/data/deletingState.qml13
2 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/declarative/states/data/deleting.qml b/tests/auto/declarative/states/data/deleting.qml
new file mode 100644
index 0000000..0c512dd
--- /dev/null
+++ b/tests/auto/declarative/states/data/deleting.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+Rectangle {
+ id: MyRectangle
+ width: 100; height: 100
+ color: "red"
+ states: State {
+ name: "blue"
+ PropertyChanges { target: MyRectangle; color: "blue"; objectName: "pc1" }
+ PropertyChanges { target: MyRectangle; radius: 5; objectName: "pc2" }
+ }
+}
diff --git a/tests/auto/declarative/states/data/deletingState.qml b/tests/auto/declarative/states/data/deletingState.qml
new file mode 100644
index 0000000..9dc46a6
--- /dev/null
+++ b/tests/auto/declarative/states/data/deletingState.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+Rectangle {
+ id: MyRectangle
+ width: 100; height: 100
+ color: "red"
+ StateGroup {
+ id: stateGroup
+ states: State {
+ name: "blue"
+ PropertyChanges { target: MyRectangle; color: "blue" }
+ }
+ }
+}