Fix and enable the tests that were disabled.

This is basically doing the same fixes as commit
5c129ceed8cb157354250e1a938f0b8af5dfe507 did in 4.7 branch.
(except that in 4.7 branch the tests were removed and then re-added)

1 files changed, 33 insertions, 37 deletions

diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index 27b8330..7346221 100644
--- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -2536,7 +2536,7 @@ void tst_QGraphicsGridLayout::geometries_data()
                                 << QRectF(0, 0, 50,10) << QRectF(50, 0, 50,10)
                                 << QRectF(0, 10, 50,100) << QRectF(50, 10, 50,400)
                             );
-#if 0
+
     QTest::newRow("hfw-100x470") << (ItemList()
                                     << ItemDesc(0,0)
                                         .minSize(QSizeF(1,1))
@@ -2551,9 +2551,9 @@ void tst_QGraphicsGridLayout::geometries_data()
                                         .preferredSize(QSizeF(50,10))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(500, 500))
+                                        .sizeHint(Qt::MinimumSize, QSizeF(40,40))
+                                        .sizeHint(Qt::PreferredSize, QSizeF(50,400))
+                                        .sizeHint(Qt::MaximumSize, QSizeF(500,500))
                                         .dynamicConstraint(hfw1, Qt::Vertical)
                                 )
                             << QSizeF(100, 470)
@@ -2562,7 +2562,6 @@ void tst_QGraphicsGridLayout::geometries_data()
                                 << QRectF(0, 70, 50,100) << QRectF(50, 70, 50,400)
                             );
 
-
     // change layout width and verify
     QTest::newRow("hfw-100x401") << (ItemList()
                                     << ItemDesc(0,0)
@@ -2578,9 +2577,9 @@ void tst_QGraphicsGridLayout::geometries_data()
                                         .preferredSize(QSizeF(50,10))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(5000, 5000))
+                                        .minSize(QSizeF(-1,-1))
+                                        .preferredSize(QSizeF(-1,-1))
+                                        .maxSize(QSizeF(-1, -1))
                                         .dynamicConstraint(hfw1, Qt::Vertical)
                                 )
                             << QSizeF(100, 401)
@@ -2589,7 +2588,7 @@ void tst_QGraphicsGridLayout::geometries_data()
                                 << QRectF( 0, 1,  50, 100) << QRectF( 50,  1,  50, 400)
                             );
 
-    QTest::newRow("hfw-160x400") << (ItemList()
+    QTest::newRow("hfw-160x350") << (ItemList()
                                     << ItemDesc(0,0)
                                         .minSize(QSizeF(1,1))
                                         .preferredSize(QSizeF(50,10))
@@ -2603,18 +2602,17 @@ void tst_QGraphicsGridLayout::geometries_data()
                                         .preferredSize(QSizeF(50,10))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(5000, 5000))
-                                        .dynamicConstraint(hfw1, Qt::Vertical)
+                                        .sizeHint(Qt::MinimumSize, QSizeF(40,40))
+                                        .sizeHint(Qt::PreferredSize, QSizeF(50,400))
+                                        .sizeHint(Qt::MaximumSize, QSizeF(5000,5000))
+                                       .dynamicConstraint(hfw1, Qt::Vertical)
                                 )
-                            << QSizeF(160, 400)
+                            << QSizeF(160, 350)
                             << (RectList()
                                 << QRectF( 0,   0,  80, 100) << QRectF( 80,   0,  80, 100)
                                 << QRectF( 0, 100,  80, 100) << QRectF( 80, 100,  80, 250)
                             );
 
-
     QTest::newRow("hfw-160x300") << (ItemList()
                                     << ItemDesc(0,0)
                                         .minSize(QSizeF(1,1))
@@ -2629,9 +2627,9 @@ void tst_QGraphicsGridLayout::geometries_data()
                                         .preferredSize(QSizeF(50,10))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,1)
-                                        .minSize(QSizeF(40,40))
-                                        .preferredSize(QSizeF(50,400))
-                                        .maxSize(QSizeF(5000, 5000))
+                                        .sizeHint(Qt::MinimumSize, QSizeF(40,40))
+                                        .sizeHint(Qt::PreferredSize, QSizeF(50,400))
+                                        .sizeHint(Qt::MaximumSize, QSizeF(5000, 5000))
                                         .dynamicConstraint(hfw1, Qt::Vertical)
                                 )
                             << QSizeF(160, 300)
@@ -2642,11 +2640,11 @@ void tst_QGraphicsGridLayout::geometries_data()
 
     QTest::newRow("hfw-20x40") << (ItemList()
                                     << ItemDesc(0,0)
-                                        .minSize(QSizeF(1,1))
+                                        .minSize(QSizeF(1,10))
                                         .preferredSize(QSizeF(50,50))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(0,1)
-                                        .minSize(QSizeF(1,10))
+                                        .minSize(QSizeF(1,1))
                                         .preferredSize(QSizeF(50,50))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,0)
@@ -2654,9 +2652,9 @@ void tst_QGraphicsGridLayout::geometries_data()
                                         .preferredSize(QSizeF(50,50))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,50))
-                                        .maxSize(QSizeF(100, 100))
+                                        .sizeHint(Qt::MinimumSize, QSizeF(1, 1))
+                                        .sizeHint(Qt::PreferredSize, QSizeF(50, 50))
+                                        .sizeHint(Qt::MaximumSize, QSizeF(100, 100))
                                         .dynamicConstraint(hfw3, Qt::Vertical)
                                 )
                             << QSizeF(20, 40)
@@ -2679,9 +2677,9 @@ void tst_QGraphicsGridLayout::geometries_data()
                                         .preferredSize(QSizeF(10,50))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,1)
-                                        .minSize(QSizeF(10,10))
-                                        .preferredSize(QSizeF(400,50))
-                                        .maxSize(QSizeF(5000, 5000))
+                                        .sizeHint(Qt::MinimumSize, QSizeF(10,10))
+                                        .sizeHint(Qt::PreferredSize, QSizeF(400,50))
+                                        .sizeHint(Qt::MaximumSize, QSizeF(5000, 5000))
                                         .dynamicConstraint(wfh1, Qt::Horizontal)
                                 )
                             << QSizeF(300, 160)
@@ -2706,9 +2704,9 @@ void tst_QGraphicsGridLayout::geometries_data()
                                         .preferredSize(QSizeF(50,50))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,50))
-                                        .maxSize(QSizeF(100, 100))
+                                        .sizeHint(Qt::MinimumSize, QSizeF(1,1))
+                                        .sizeHint(Qt::PreferredSize, QSizeF(50,50))
+                                        .sizeHint(Qt::MaximumSize, QSizeF(100, 100))
                                         .dynamicConstraint(wfh2, Qt::Horizontal)
                                 )
                             << QSizeF(40, 20)
@@ -2731,9 +2729,9 @@ void tst_QGraphicsGridLayout::geometries_data()
                                         .preferredSize(QSizeF(50,50))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(50,50))
-                                        .maxSize(QSizeF(100, 100))
+                                        .sizeHint(Qt::MinimumSize, QSizeF(1,1))
+                                        .sizeHint(Qt::PreferredSize, QSizeF(50,50))
+                                        .sizeHint(Qt::MaximumSize, QSizeF(100, 100))
                                         .dynamicConstraint(wfh2, Qt::Horizontal)
                                 )
 
@@ -2762,9 +2760,9 @@ void tst_QGraphicsGridLayout::geometries_data()
                                         .preferredSize(QSizeF(10,50))
                                         .maxSize(QSizeF(100, 100))
                                     << ItemDesc(1,1)
-                                        .minSize(QSizeF(1,1))
-                                        .preferredSize(QSizeF(10,50))
-                                        .maxSize(QSizeF(500, 500))
+                                        .sizeHint(Qt::MinimumSize, QSizeF(1,1))
+                                        .sizeHint(Qt::PreferredSize, QSizeF(10,50))
+                                        .sizeHint(Qt::MaximumSize, QSizeF(500, 500))
                                         .dynamicConstraint(wfh2, Qt::Horizontal)
                                 )
                             << QSizeF(160, 100)
@@ -2772,7 +2770,6 @@ void tst_QGraphicsGridLayout::geometries_data()
                                 << QRectF(0,  0,  80,  50) << QRectF( 80,  0,  80,  50)
                                 << QRectF(0, 50,  80,  50) << QRectF( 80, 50,  50,  50)
                             );
-#endif
 
     QTest::newRow("hfw-h470") << (ItemList()
                                     << ItemDesc(0,0)
@@ -2799,7 +2796,6 @@ void tst_QGraphicsGridLayout::geometries_data()
                                 << QRectF(0, 70, 50,100) << QRectF(50, 70, 50,400)
                             );
 
-
     // change layout width and verify
     QTest::newRow("hfw-w100") << (ItemList()
                                     << ItemDesc(0,0)