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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Move xmldata example into rssnews demo.
  Move Q_ENUMS to start of class declaration
  Restructure QDeclarativeAbstractBinding destructor
  Don't call pure virtual method in ~QDeclarativeAbstractBinding()
  Fix examples autotest when compiled without webkit or xmlpatterns
  Check for acquireReg() failure
  Focus should be applied to focus scopes all the way up the chain, not
  Add focus docs snippets
  Fix doc for status, add Image::onLoaded.
  Don't crash due to recursive positioning.
  ListModel::get() shouldn't print warnings for invalid indices since it
  Add \brief to TextInput
  Add missing .pro
  Restructure the examples. They are now organized into various
  graphicsWidgets doc example was previously removed
  Doc fix
  Add a "priority" property to Keys and KeyNavigation

1 files changed, 20 insertions, 0 deletions

diff --git a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml b/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
new file mode 100644
index 0000000..d247943
--- /dev/null
+++ b/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
@@ -0,0 +1,20 @@
+import Qt 4.7
+
+Item {
+    signal clicked
+
+    states: [
+        State { name: "X"; PropertyChanges { target: image; source: "pics/x.png" } },
+        State { name: "O"; PropertyChanges { target: image; source: "pics/o.png" } }
+    ]
+
+    Image {
+        id: image
+        anchors.centerIn: parent
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: parent.clicked()
+    }
+}