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: (130 commits)
  Warning
  Read Maemo orientation at startup
  Exclude gestures from examples autotest
  Exclude proxywidgets from examples autotest
  Fix crash on QScriptProgram destruction
  doc fixes
  Start documenting coding conventions
  Adds missing qml file to qdeclarativeflipable autotest
  Revert "Better reporting of extension plugin loading errors."
  Doc
  Fix graphicswidget auto-test.
  Add Mac OS X bundle description for qml runtime
  Cleanup
  Disallow writes to read-only value type properties
  Allow undefined to be assigned to QVariant properties
  Add a Qt.isQtObject() method
  Fix crash in QML library imports
  Remove QT_VERSION checks in QML
  List properties aren't read-only
  Small doc fix.
  ...

1 files changed, 16 insertions, 21 deletions

diff --git a/examples/declarative/layouts/layouts.qml b/examples/declarative/layouts/layouts.qml
index 4b2a3f8..1d34afd 100644
--- a/examples/declarative/layouts/layouts.qml
+++ b/examples/declarative/layouts/layouts.qml
@@ -1,30 +1,25 @@
-import Qt 4.6
+import Qt 4.7
 import Qt.widgets 4.6
 Item {
     id: resizable
     width:400
     height:400
+    QGraphicsWidget {
+        size.width:parent.width
+        size.height:parent.height
 
-    GraphicsObjectContainer {
-        anchors.fill:parent
-
-        QGraphicsWidget {
-            size.width:parent.width
-            size.height:parent.height
-
-            layout: QGraphicsLinearLayout {
-                LayoutItem {
-                    minimumSize: "100x100"
-                    maximumSize: "300x300"
-                    preferredSize: "100x100"
-                    Rectangle { color: "yellow"; anchors.fill: parent }
-                }
-                LayoutItem {
-                    minimumSize: "100x100"
-                    maximumSize: "400x400"
-                    preferredSize: "200x200"
-                    Rectangle { color: "green"; anchors.fill: parent }
-                }
+        layout: QGraphicsLinearLayout {
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { color: "green"; anchors.fill: parent }
             }
         }
     }