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

 Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152

1 files changed, 39 insertions, 5 deletions

diff --git a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
index 365508024b..85a2dae3b6 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
+++ b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
@@ -45,8 +45,10 @@ class tst_QEventDispatcher : public QObject
     Q_OBJECT
 
     QAbstractEventDispatcher *eventDispatcher;
-    int receivedEventType;
-    int timerIdFromEvent;
+
+    int receivedEventType = -1;
+    int timerIdFromEvent = -1;
+    bool doubleTimer = false;
 
 protected:
     bool event(QEvent *e);
@@ -54,9 +56,7 @@ protected:
 public:
     inline tst_QEventDispatcher()
         : QObject(),
-          eventDispatcher(QAbstractEventDispatcher::instance(thread())),
-          receivedEventType(-1),
-          timerIdFromEvent(-1)
+          eventDispatcher(QAbstractEventDispatcher::instance(thread()))
     { }
 
 private slots:
@@ -75,6 +75,9 @@ bool tst_QEventDispatcher::event(QEvent *e)
     switch (receivedEventType = e->type()) {
     case QEvent::Timer:
     {
+        // sometimes, two timers fire during a single QTRY_xxx wait loop
+        if (timerIdFromEvent != -1)
+            doubleTimer = true;
         timerIdFromEvent = static_cast<QTimerEvent *>(e)->timerId();
         return true;
     }
@@ -206,10 +209,31 @@ void tst_QEventDispatcher::registerTimer()
     QVERIFY(timers.foundCoarse());
     QVERIFY(timers.foundVeryCoarse());
 
+#ifdef Q_OS_DARWIN
+    /*
+        We frequently experience flaky failures on macOS. Assumption is that this is
+        due to undeterministic VM scheduling, making us process events for significantly
+        longer than expected and resulting in timers firing in undefined order.
+        To detect this condition, we use a QElapsedTimer, and skip the test.
+    */
+    QElapsedTimer elapsedTimer;
+    elapsedTimer.start();
+#endif
+
     // process events, waiting for the next event... this should only fire the precise timer
     receivedEventType = -1;
     timerIdFromEvent = -1;
+    doubleTimer = false;
     QTRY_COMPARE_WITH_TIMEOUT(receivedEventType, int(QEvent::Timer), PreciseTimerInterval * 2);
+
+#ifdef Q_OS_DARWIN
+    if (doubleTimer)
+        QSKIP("Double timer during a single timeout - aborting test as flaky on macOS");
+    if (timerIdFromEvent != timers.preciseTimerId()
+        && elapsedTimer.elapsed() > PreciseTimerInterval * 3)
+        QSKIP("Ignore flaky test behavior due to VM scheduling on macOS");
+#endif
+
     QCOMPARE(timerIdFromEvent, timers.preciseTimerId());
     // now unregister it and make sure it's gone
     timers.unregister(timers.preciseTimerId());
@@ -223,7 +247,17 @@ void tst_QEventDispatcher::registerTimer()
     // do the same again for the coarse timer
     receivedEventType = -1;
     timerIdFromEvent = -1;
+    doubleTimer = false;
     QTRY_COMPARE_WITH_TIMEOUT(receivedEventType, int(QEvent::Timer), CoarseTimerInterval * 2);
+
+#ifdef Q_OS_DARWIN
+    if (doubleTimer)
+        QSKIP("Double timer during a single timeout - aborting test as flaky on macOS");
+    if (timerIdFromEvent != timers.coarseTimerId()
+        && elapsedTimer.elapsed() > CoarseTimerInterval * 3)
+        QSKIP("Ignore flaky test behavior due to VM scheduling on macOS");
+#endif
+
     QCOMPARE(timerIdFromEvent, timers.coarseTimerId());
     // now unregister it and make sure it's gone
     timers.unregister(timers.coarseTimerId());