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

 Conflicts:
	src/gui/painting/qdrawhelper.cpp

Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 943fb997cd..5b4761ba87 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -1671,6 +1671,13 @@ void tst_QComboBox::setCustomModelAndView()
     QTRY_VERIFY(combo.view()->isVisible());
     const QRect subItemRect = view->visualRect(model->indexFromItem(subItem));
     QWidget *window = view->window();
+
+    // QComboBox sometimes ignores the mouse click event for doubleClickInterval
+    // depending on which tests have been run previously. On arm this happens
+    // more often than on x86. Search for maybeIgnoreMouseButtonRelease to see
+    // why this happens.
+    QTest::qWait(QApplication::doubleClickInterval());
+
     QTest::mouseClick(window->windowHandle(), Qt::LeftButton, 0, view->mapTo(window, subItemRect.center()));
 #ifdef Q_OS_WINRT
     QEXPECT_FAIL("", "Fails on WinRT - QTBUG-68297", Abort);
@@ -3421,6 +3428,11 @@ void tst_QComboBox::task_QTBUG_52027_mapCompleterIndex()
     model->setFilterFixedString("foobar1");
     completer->setModel(model);
 
+    if (QGuiApplication::platformName() == "offscreen") {
+        QWARN("Offscreen platform requires explicit activateWindow()");
+        cbox.activateWindow();
+    }
+
     QApplication::setActiveWindow(&cbox);
     QVERIFY(QTest::qWaitForWindowActive(&cbox));