1 files changed, 9 insertions, 5 deletions
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index b9d6888263..7bce23af26 100644
--- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -461,26 +461,30 @@ void tst_QSpinBox::setPrefixSuffix()
     QFETCH(QString, expectedCleanText);
     QFETCH(bool, show);
 
-    QSpinBox spin(0);
+    QSpinBox spin;
+    if (show) {
+        spin.show();
+        spin.setPrefix(QString());  // trigger a recalc of sizeHint
+    }
     const QSize size1 = spin.sizeHint();
     spin.setPrefix(prefix);
     const QSize size2 = spin.sizeHint();
     spin.setSuffix(suffix);
     const QSize size3 = spin.sizeHint();
     spin.setValue(value);
-    if (show)
-        spin.show();
 
     QCOMPARE(spin.prefix(), prefix);
     QCOMPARE(spin.suffix(), suffix);
     QCOMPARE(spin.text(), expectedText);
     QCOMPARE(spin.cleanText(), expectedCleanText);
 
-    if (!prefix.isEmpty() && !suffix.isEmpty()) {
-        QVERIFY(size1.width() < size2.width());
+    if (!suffix.isEmpty()) {
         QVERIFY(size2.width() < size3.width());
         spin.setSuffix(QString());
         QCOMPARE(spin.sizeHint(), size2);
+    }
+    if (!prefix.isEmpty()) {
+        QVERIFY(size1.width() < size2.width());
         spin.setPrefix(QString());
         QCOMPARE(spin.sizeHint(), size1);
     }