Merge remote branch 'origin/master' into qt-master-from-4.6

Conflicts:
	tests/auto/qlineedit/tst_qlineedit.cpp
	tests/benchmarks/benchmarks.pro

1 files changed, 57 insertions, 0 deletions

diff --git a/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml b/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml
new file mode 100644
index 0000000..70fafd6
--- /dev/null
+++ b/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml
@@ -0,0 +1,57 @@
+import Qt 4.6
+
+QGraphicsView {
+    objectName: "GView"
+    size: "800x600"
+
+    QGraphicsScene {
+        objectName: "GScene"
+        sceneRect: "0,0,500x300"
+
+        QGraphicsWidget {
+            layout: QGraphicsLinearLayout {
+                orientation: Qt.Horizontal
+                QGraphicsWidget {
+                    layout: QGraphicsLinearLayout {
+                        spacing: 10; orientation: Qt.Vertical
+                        LayoutItem {
+                            QGraphicsLinearLayout.stretchFactor: 1
+                            objectName: "left"
+                            minimumSize: "100x100"
+                            maximumSize: "300x300"
+                            preferredSize: "100x100"
+                            Rectangle { objectName: "yellowRect"; color: "yellow"; anchors.fill: parent }
+                        }
+                        LayoutItem {
+                            QGraphicsLinearLayout.stretchFactor: 10
+                            objectName: "left"
+                            minimumSize: "100x100"
+                            maximumSize: "300x300"
+                            preferredSize: "100x100"
+                            Rectangle { objectName: "yellowRect"; color: "blue"; anchors.fill: parent }
+                        }
+                    }
+                }
+                QGraphicsWidget {
+                    layout: QGraphicsLinearLayout {
+                        spacing: 10; orientation: Qt.Vertical
+                        LayoutItem {
+                            objectName: "left"
+                            minimumSize: "100x100"
+                            maximumSize: "300x300"
+                            preferredSize: "100x100"
+                            Rectangle { objectName: "yellowRect"; color: "red"; anchors.fill: parent }
+                        }
+                        LayoutItem {
+                            objectName: "left"
+                            minimumSize: "100x100"
+                            maximumSize: "300x300"
+                            preferredSize: "100x100"
+                            Rectangle { objectName: "yellowRect"; color: "green"; anchors.fill: parent }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}