Merge commit 'origin/4.5' into 4.6

Conflicts:
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp

2 files changed, 3 insertions, 0 deletions

diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 4e46819..4f28df4 100644
--- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -1370,6 +1370,8 @@ void tst_QGraphicsLinearLayout::layoutDirection()
     QGraphicsWidget *window = new QGraphicsWidget(0, Qt::Window);
     QGraphicsLinearLayout *layout = new QGraphicsLinearLayout;
     layout->setContentsMargins(1, 2, 3, 4);
+    layout->setSpacing(6);
+
     RectWidget *w1 = new RectWidget;
     w1->setPreferredSize(20, 20);
     w1->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 921f7f8..df3ebef 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -2977,6 +2977,7 @@ void tst_QGraphicsView::task245469_itemsAtPointWithClip()
     parent->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
 
     QGraphicsView view(&scene);
+    view.resize(150,150);
     view.rotate(90);
     view.show();
     QTest::qWaitForWindowShown(&view);