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:
  Add missing file
  Docs - clarify use of PropertyChanges for immediate property changes in
  Update QtDeclarative def files
  Update QtGui def files
  Add missing auto test files.
  Fix game could not be restarted
  Handle QGraphicsWidgets in Flickable
  More positioners with QGraphicsWidgets fixes.
  Make positioners work with QGraphicsWidgets also
  emit countChanged where appropriate in Repeater

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml
new file mode 100644
index 0000000..8e95a94
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml
@@ -0,0 +1,7 @@
+import Qt 4.7
+
+Flickable {
+    width: 100; height: 100
+
+    QGraphicsWidget { objectName: "widget1"; width: 200; height: 300 }
+}