Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (139 commits)
  Fixed qdeclarativeconnection test.
  missed rename
  Revert "Some animation cleanup/refactoring."
  Rename files to follow class name.
  Change Connection syntax as per QT-2822.
  Doc
  update painted geometry on pixmapChanged rather than sourceChanged
  Make Flickable overshoot behavior nicer.
  Polish QDeclarativeProperty API
  Test, demo, and work-around bug QTBUG-8535
  Fix ParentAnimation crash.
  Tiny doc tweak.
  Work around requires() bug in qmake
  Make sure that QEasingCurve::type when streamed is a quint8, as documented
  Add QEasingCurve to datastream format docs
  Move QEasingCurve datastream autotest to qdatastream for more comprehensive tests
  Some animation cleanup/refactoring.
  Fix Flickable.overShoot doc - it is a bool not a real
  Rebuild since -declarative auto detection changed.
  Renamed Flickable viewportXXX properties contentXXX
  ...

35 files changed, 659 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml b/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
new file mode 100644
index 0000000..8d64663
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
@@ -0,0 +1,19 @@
+import Qt 4.6
+Rectangle {
+    id: extendedRect
+    objectName: "extendedRect"
+    property color extendedColor: "orange"
+
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "green"
+        PropertyChanges {
+            target: rect
+            onDidSomething: {
+                extendedRect.color = "green"
+                extendedColor = "green"
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges.qml
new file mode 100644
index 0000000..7dce889
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+Rectangle {
+    id: container
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        width: 50; height: 50
+        color: "green";
+        anchors.left: parent.left
+        anchors.leftMargin: 5
+    }
+    states: State {
+        name: "right"
+        AnchorChanges {
+            id: ancCh
+            target: myRect;
+            reset: "left"
+            right: container.right
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
new file mode 100644
index 0000000..545345e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        width: 50; height: 50
+        color: "green";
+        anchors.left: parent.left
+        anchors.leftMargin: 5
+    }
+    states: State {
+        name: "right"
+        AnchorChanges {
+            target: myRect;
+            reset: "left"
+            right: parent.right
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
new file mode 100644
index 0000000..9d5b317
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
@@ -0,0 +1,29 @@
+import Qt 4.6
+
+Rectangle {
+    id: container
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        color: "green";
+        anchors.left: parent.left
+        anchors.right: rightGuideline.left
+        anchors.top: topGuideline.top
+        anchors.bottom: container.bottom
+    }
+    Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 }
+    Item { id: rightGuideline; x: 150 }
+    Item { id: topGuideline; y: 10 }
+    Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 }
+    states: State {
+        name: "reanchored"
+        AnchorChanges {
+            target: myRect;
+            left: leftGuideline.left
+            right: container.right
+            top: container.top
+            bottom: bottomGuideline.bottom
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
new file mode 100644
index 0000000..f128989
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
@@ -0,0 +1,22 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        color: "green";
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.verticalCenter: parent.verticalCenter
+    }
+    Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 }
+    Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 }
+    states: State {
+        name: "reanchored"
+        AnchorChanges {
+            target: myRect;
+            horizontalCenter: bottomGuideline.horizontalCenter
+            verticalCenter: leftGuideline.verticalCenter
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
new file mode 100644
index 0000000..4e6d34b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
@@ -0,0 +1,22 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        color: "green";
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.baseline: parent.baseline
+    }
+    Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 }
+    Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 }
+    states: State {
+        name: "reanchored"
+        AnchorChanges {
+            target: myRect;
+            horizontalCenter: bottomGuideline.horizontalCenter
+            baseline: leftGuideline.baseline
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml b/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
new file mode 100644
index 0000000..693a5c5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Item {
+    id: root
+    property int input: 1
+    property int test: 9
+
+    states: [
+        State {
+            name: "portrait"
+            when: root.input == 1
+            PropertyChanges {
+                target: root
+                test: 3
+            }
+        }
+    ]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
new file mode 100644
index 0000000..6528113
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+
+    property color sourceColor: "blue"
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; color: sourceColor }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
new file mode 100644
index 0000000..2e7b4cf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+
+    property color sourceColor: "red"
+    width: 100; height: 100
+    color: sourceColor
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; color: "blue" }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
new file mode 100644
index 0000000..a3c47d9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+
+    property color sourceColor: "red"
+    property color sourceColor2: "blue"
+    width: 100; height: 100
+    color: sourceColor
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; color: sourceColor2 }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
new file mode 100644
index 0000000..1f52d0e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
@@ -0,0 +1,17 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+
+    property color sourceColor: "blue"
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: sourceColor }
+        },
+        State {
+            name: "green"
+            PropertyChanges { target: myRectangle; color: "green" }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
new file mode 100644
index 0000000..88ea256
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; color: "blue" }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
new file mode 100644
index 0000000..4dd293f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: "blue" }
+        },
+        State {
+            name: "green"
+            PropertyChanges { target: myRectangle; color: "green" }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
new file mode 100644
index 0000000..62ab1d5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: "blue" }
+        },
+        State {
+            name: "bordered"
+            PropertyChanges { target: myRectangle; border.width: 2 }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml
new file mode 100644
index 0000000..a373cfc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml
@@ -0,0 +1,19 @@
+import Qt.test 1.0
+import Qt 4.6
+
+MyRectangle {
+    id: rect
+    width: 100; height: 100
+    color: "red"
+
+    states: State {
+        name: "aBlueDay"
+        PropertyChanges {
+            target: rect
+            onPropertyWithNotifyChanged: { rect.color = "blue"; }
+        }
+    }
+
+    Component.onCompleted: rect.state = "aBlueDay"
+}
+
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml b/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
new file mode 100644
index 0000000..1836f8a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: "blue" }
+        },
+        State {
+            name: "bordered"
+            extend: "blue"
+            PropertyChanges { target: myRectangle; border.width: 2 }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/deleting.qml b/tests/auto/declarative/qdeclarativestates/data/deleting.qml
new file mode 100644
index 0000000..3da0b12
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/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/qdeclarativestates/data/deletingState.qml b/tests/auto/declarative/qdeclarativestates/data/deletingState.qml
new file mode 100644
index 0000000..a5e8ed3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/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" }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/explicit.qml b/tests/auto/declarative/qdeclarativestates/data/explicit.qml
new file mode 100644
index 0000000..7543f84
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/explicit.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    property color sourceColor: "blue"
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges {
+            objectName: "changes"
+            target: myRectangle; explicit: true
+            color: sourceColor
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml b/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
new file mode 100644
index 0000000..c7975e1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: "blue" }
+        },
+        State {
+            name: "green"
+            extend: "blue"
+            PropertyChanges { target: myRectangle; color: "green" }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml b/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
new file mode 100644
index 0000000..0dc39ae
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle {
+    id: card
+    width: 100; height: 100
+
+    states: [
+        State {
+            name: "placed"
+            PropertyChanges { target: card; state: "idle" }
+        },
+        State {
+            name: "idle"
+        }
+    ]
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: card.state = "placed"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml b/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
new file mode 100644
index 0000000..9be984c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+Rectangle {
+    id: card
+    width: 100; height: 100
+
+    states: [
+        State {
+            name: "placed"
+            onCompleted: card.state = "idle"
+            StateChangeScript { script: console.log("entering placed") }
+        },
+        State {
+            name: "idle"
+            StateChangeScript { script: console.log("entering idle") }
+        }
+    ]
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: card.state = "placed"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml b/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml
new file mode 100644
index 0000000..a5dd86a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.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; colr: "blue" }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange.qml
new file mode 100644
index 0000000..b8c7818
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange.qml
@@ -0,0 +1,37 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Item {
+        x: 10; y: 10
+        Rectangle {
+            id: myRect
+            objectName: "MyRect"
+            x: 5
+            width: 100; height: 100
+            color: "red"
+        }
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        x: -100; y: -50
+        Item {
+            id: newParent
+            objectName: "NewParent"
+            x: 248; y: 360
+        }
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
new file mode 100644
index 0000000..8b23591
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
@@ -0,0 +1,31 @@
+import Qt 4.6
+
+Rectangle {
+    id: newParent
+    width: 400; height: 400
+    Item {
+        scale: .5
+        rotation: 15
+        x: 10; y: 10
+        Rectangle {
+            id: myRect
+            objectName: "MyRect"
+            x: 5
+            width: 100; height: 100
+            color: "red"
+        }
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
new file mode 100644
index 0000000..ddf9268
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
@@ -0,0 +1,42 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Item {
+        scale: .5
+        rotation: 15
+        transformOrigin: "Center"
+        x: 10; y: 10
+        Rectangle {
+            id: myRect
+            objectName: "MyRect"
+            x: 5
+            width: 100; height: 100
+            transformOrigin: "BottomLeft"
+            color: "red"
+        }
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        x: 200; y: 200
+        rotation: 52;
+        scale: 2
+        Item {
+            id: newParent
+            x: 100; y: 100
+        }
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
new file mode 100644
index 0000000..34d667a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
@@ -0,0 +1,30 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        x: 5; y: 5
+        width: 100; height: 100
+        color: "red"
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        id: newParent
+        transform: Scale { xScale: .5; yScale: .7}
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
new file mode 100644
index 0000000..56bdd89
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
@@ -0,0 +1,30 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        x: 5; y: 5
+        width: 100; height: 100
+        color: "red"
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        id: newParent
+        transform: Rotation { angle: 30; axis { x: 0; y: 1; z: 0 } }
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml b/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
new file mode 100644
index 0000000..080e833
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; colr: "blue"; wantsFocus: true }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/reset.qml b/tests/auto/declarative/qdeclarativestates/data/reset.qml
new file mode 100644
index 0000000..a0a2b8c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/reset.qml
@@ -0,0 +1,20 @@
+import Qt 4.6
+
+Rectangle {
+    width: 640
+    height: 480
+    Text {
+        id: theText
+        width: 50
+        wrap: true
+        text: "a text string that is longer than 50 pixels"
+    }
+
+    states: State {
+        name: "state1"
+        PropertyChanges {
+            target: theText
+            width: undefined
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml b/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
new file mode 100644
index 0000000..088c608
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges {
+            target: myRectangle
+            restoreEntryValues: false
+            color: "blue"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/script.qml b/tests/auto/declarative/qdeclarativestates/data/script.qml
new file mode 100644
index 0000000..3c5f33e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/script.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        StateChangeScript { script: myRectangle.color = "blue"; }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
new file mode 100644
index 0000000..5ba1566
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+import Qt.test 1.0
+
+MyRectangle {
+    id: rect
+
+    onDidSomething: color = "blue"
+
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "green"
+        PropertyChanges {
+            target: rect
+            onDidSomething: color = "green"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
new file mode 100644
index 0000000..527e165
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+import Qt.test 1.0
+
+MyRectangle {
+    id: rect
+    onDidSomething: color = "blue"
+    width: 100; height: 100
+    ExtendedRectangle {}
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
new file mode 100644
index 0000000..702fa86
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+import Qt.test 1.0
+
+MyRectangle {
+    id: rect
+
+    width: 100; height: 100
+    states: State {
+        name: "overridden"
+        PropertyChanges {
+            target: rect
+            onDidSomething: rect.state = ""
+        }
+    }
+}