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

 Conflicts:
	examples/network/fortuneclient/client.cpp
	examples/network/fortuneserver/server.cpp
	src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
	src/plugins/platforms/cocoa/qcocoabackingstore.h
	src/plugins/platforms/cocoa/qcocoaintegration.h
	src/plugins/platforms/cocoa/qcocoascreen.h
	src/plugins/platforms/ios/qiosbackingstore.h
	src/plugins/sqldrivers/oci/qsql_oci.cpp
	src/widgets/kernel/qwidgetwindow.cpp

Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10

1 files changed, 10 insertions, 1 deletions

diff --git a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
index 304f6121a5..15a39b62c0 100644
--- a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
+++ b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
@@ -41,6 +41,7 @@ protected slots:
     void simple_activated();
     void simple_timerSet();
 private slots:
+    void simple_data();
     void simple();
     void manyNotifiers();
 
@@ -61,9 +62,17 @@ void tst_QWinEventNotifier::simple_timerSet()
     SetEvent((HANDLE)simpleHEvent);
 }
 
+void tst_QWinEventNotifier::simple_data()
+{
+    QTest::addColumn<bool>("resetManually");
+    QTest::newRow("manual_reset") << true;
+    QTest::newRow("auto_reset") << false;
+}
+
 void tst_QWinEventNotifier::simple()
 {
-    simpleHEvent = CreateEvent(0, true, false, 0);
+    QFETCH(bool, resetManually);
+    simpleHEvent = CreateEvent(0, resetManually, false, 0);
     QVERIFY(simpleHEvent);
 
     QWinEventNotifier n(simpleHEvent);