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

 Conflicts:
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_mouse.mm
	src/testlib/testlib.pro

Change-Id: Ia0ce4243418fe6a485b0f290c67bd433b3b04ff2

1 files changed, 7 insertions, 3 deletions

diff --git a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
index 74beab96a6..ac8aaa1327 100644
--- a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
+++ b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
@@ -146,6 +146,7 @@ public:
     HANDLE eventHandle() const { return notifier.handle(); }
     int numberOfTimesActivated() const { return activatedCount; }
     void setEnabled(bool b) { notifier.setEnabled(b); }
+    bool isEnabled() const { return notifier.isEnabled(); }
 
 signals:
     void activated();
@@ -239,8 +240,9 @@ void tst_QWinEventNotifier::disableNotifiersInActivatedSlot()
     for (int i = 0; i < count; ++i)
         events[i].reset(new EventWithNotifier);
 
-    auto isActivatedOrNull = [&events](int i) {
-        return !events.at(i) || events.at(i)->numberOfTimesActivated() > 0;
+    auto isActivatedOrDisabled = [&events](int i) {
+        return !events.at(i) || !events.at(i)->isEnabled()
+               || events.at(i)->numberOfTimesActivated() > 0;
     };
 
     for (auto &e : events) {
@@ -251,8 +253,10 @@ void tst_QWinEventNotifier::disableNotifiersInActivatedSlot()
                 else
                     events.at(i)->setEnabled(false);
             }
-            if (std::all_of(notifiersToSignal.begin(), notifiersToSignal.end(), isActivatedOrNull))
+            if (std::all_of(notifiersToSignal.begin(), notifiersToSignal.end(),
+                            isActivatedOrDisabled)) {
                 QTimer::singleShot(0, &QTestEventLoop::instance(), SLOT(exitLoop()));
+            }
         });
     }
     for (int i : notifiersToSignal)