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, 2 insertions, 5 deletions

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 37f0864213..80844715ef 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -1995,19 +1995,16 @@ void tst_QComboBox::flaggedItems()
     QApplication::setActiveWindow(&comboBox);
     comboBox.activateWindow();
     comboBox.setFocus();
+    QVERIFY(QTest::qWaitForWindowActive(&comboBox));
     QTRY_VERIFY(comboBox.isVisible());
     QTRY_VERIFY(comboBox.hasFocus());
 
     if (editable)
         comboBox.lineEdit()->selectAll();
 
-    QSignalSpy indexChangedInt(&comboBox, SIGNAL(currentIndexChanged(int)));
     for (int i = 0; i < keyMovementList.count(); ++i) {
         Qt::Key key = keyMovementList[i];
         QTest::keyClick(&comboBox, key);
-        if (indexChangedInt.count() != i + 1) {
-            QTest::qWait(400);
-        }
     }
 
     QCOMPARE(comboBox.currentIndex() , expectedIndex);
@@ -2447,7 +2444,7 @@ void tst_QComboBox::task220195_keyBoardSelection2()
     combo.addItem( QLatin1String("foo3"));
     combo.show();
     QApplication::setActiveWindow(&combo);
-    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&combo));
+    QVERIFY(QTest::qWaitForWindowActive(&combo));
 
     combo.setCurrentIndex(-1);
     QVERIFY(combo.currentText().isNull());