Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I9f802cb9b4d9ccba77ca39428a5cb1afd2d01642

5 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog/qfiledialog.pro b/tests/auto/widgets/dialogs/qfiledialog/qfiledialog.pro
index 4ea23a896f..1cdf10d29a 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/qfiledialog.pro
+++ b/tests/auto/widgets/dialogs/qfiledialog/qfiledialog.pro
@@ -9,5 +9,3 @@ QT += core-private gui-private
 SOURCES += tst_qfiledialog.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
-
-linux*: CONFIG += insignificant_test # Crashes on different Linux distros
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST b/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST
index fea108f3fd..0f7c377194 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST
+++ b/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST
@@ -2,3 +2,6 @@
 opensuse-42.3 ci
 [testLineEditValidation]
 opensuse-42.3 ci
+[comboBox]
+# QTBUG-67282
+opensuse
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index 2fed2e0c69..802a04b4bf 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -1389,13 +1389,12 @@ void tst_QItemDelegate::comboBox()
     QTableWidget widget(1, 1);
     widget.setItem(0, 0, item1);
     widget.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&widget));
 
     widget.editItem(item1);
 
-    QTestEventLoop::instance().enterLoop(1);
-
-    QComboBox *boolEditor = widget.viewport()->findChild<QComboBox*>();
-    QVERIFY(boolEditor);
+    QComboBox *boolEditor = nullptr;
+    QTRY_VERIFY( (boolEditor = widget.viewport()->findChild<QComboBox*>()) );
     QCOMPARE(boolEditor->currentIndex(), 1); // True is selected initially.
     // The data must actually be different in order for the model
     // to be updated.
diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index 9021be1515..1d2bb00678 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -911,7 +911,7 @@ void tst_QWidget_window::setWindowState()
     // Minimizing keeps other states
     w.showMinimized();
     QCOMPARE(w.windowState(), state | Qt::WindowMinimized);
-    QTest::qWait(100);
+    QTest::qWait(200);
     QCOMPARE(w.windowState(), state | Qt::WindowMinimized);
     QCOMPARE(w.windowHandle()->windowStates(), state | Qt::WindowMinimized);
 }
diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
index 2ab2fa4c86..a78ebdb2b9 100644
--- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
@@ -128,12 +128,12 @@ void tst_QMacStyle::sizeHints()
     QComboBox comboBox1(&w);
     comboBox1.setEditable(false);
     comboBox1.addItem("Foo");
-    QCOMPARE(sh(&comboBox1).height(), SIZE(20, 17, 15));
+    QCOMPARE(sh(&comboBox1).height(), SIZE(26, 17, 15));
 
     QComboBox comboBox2(&w);
     comboBox2.setEditable(true);
     comboBox2.addItem("Foo");
-    QCOMPARE(sh(&comboBox2).height(), SIZE(22, 17, 15));
+    QCOMPARE(sh(&comboBox2).height(), SIZE(26, 17, 15));
 
     // Combos in toolbars use the actual widget rect to
     // avoid faulty clipping:
@@ -141,7 +141,7 @@ void tst_QMacStyle::sizeHints()
     setSize(&tb, size);
     QComboBox comboBox3(&tb);
     comboBox3.addItem("Foo");
-    QCOMPARE(sh(&comboBox3).height(), SIZE(26, -1, -1));
+    QCOMPARE(sh(&comboBox3).height(), SIZE(32, -1, -1));
 
     QSlider slider1(Qt::Horizontal, &w);
     QCOMPARE(sh(&slider1).height(), SIZE(15, 12, 10));