Fix the QGridLayout autotest

One issue was that the text of a QPushButton would stretch the widget if the
platform font is to big. The other issue was that the autotest did not expect
that show might translate to a showFullScreen on some platforms.

Change-Id: I3a9903979d766d04c402fda309d0492cfa506ed6
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index 1003a9fb1f..3b7c2ac14d 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -713,7 +713,7 @@ void tst_QGridLayout::spacingsAndMargins()
 
     grid1.setColumnStretch(columns-1, 1);
     grid1.setRowStretch(rows-1, 1);
-    toplevel.show();
+    toplevel.showNormal();
     toplevel.adjustSize();
     QApplication::processEvents();
     QVERIFY(QTest::qWaitForWindowExposed(&toplevel));
@@ -1230,6 +1230,9 @@ void tst_QGridLayout::layoutSpacing_data()
         style->reimplementSubelementRect = true;
         QApplication::setStyle(style);
         QWidget *w = new QWidget();
+        QFont font;
+        font.setPixelSize(10);
+        w->setFont(font);
         setFrameless(w);
         QGridLayout *layout = new QGridLayout();
         QPushButton *pb1 = new QPushButton(QLatin1String("Push 1"), w);