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

 Conflicts:
	src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: Ideea96d1b43d47b1d9b34e11c9986a88e240aa71

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index 5382d5c6db..9c56d30dfb 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -167,6 +167,7 @@ void tst_QDoubleSpinBox::initTestCase()
     testFocusWidget = new QWidget(0);
     testFocusWidget->resize(200, 100);
     testFocusWidget->show();
+    QVERIFY(QTest::qWaitForWindowActive(testFocusWidget));
 }
 
 void tst_QDoubleSpinBox::cleanupTestCase()
@@ -773,8 +774,7 @@ void tst_QDoubleSpinBox::editingFinished()
 
     testFocusWidget->show();
     QApplication::setActiveWindow(testFocusWidget);
-    QTest::qWait(10);
-    QTRY_VERIFY(testFocusWidget->isActiveWindow());
+    QVERIFY(QTest::qWaitForWindowActive(testFocusWidget));
     box->setFocus();
     QTRY_VERIFY(box->hasFocus());
 
@@ -1000,7 +1000,7 @@ void tst_QDoubleSpinBox::task224497_fltMax()
     dspin->setMinimum(3);
     dspin->setMaximum(FLT_MAX);
     dspin->show();
-    QTest::qWait(1000);
+    QVERIFY(QTest::qWaitForWindowActive(dspin));
     dspin->lineEdit()->selectAll();
     QTest::keyClick(dspin->lineEdit(), Qt::Key_Delete);
     QTest::keyClick(dspin->lineEdit(), Qt::Key_1);