Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev

2 files changed, 8 insertions, 4 deletions

diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
index 3f53ab5f0a..38b6e9ab50 100644
--- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
+++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
@@ -309,12 +309,13 @@ void tst_QDebug::textStreamModifiers() const
 
 void tst_QDebug::defaultMessagehandler() const
 {
-    MessageHandlerSetter mhs(0);
-    QtMessageHandler defaultMessageHandler1 = qInstallMessageHandler((QtMessageHandler)0);
-    QtMessageHandler defaultMessageHandler2 = qInstallMessageHandler(myMessageHandler);
+    MessageHandlerSetter mhs(0); // set 0, should set default handler
+    QtMessageHandler defaultMessageHandler1 = qInstallMessageHandler((QtMessageHandler)0); // set 0, should set and return default handler
+    QVERIFY(defaultMessageHandler1);
+    QtMessageHandler defaultMessageHandler2 = qInstallMessageHandler(myMessageHandler); // set myMessageHandler and return default handler
     bool same = (*defaultMessageHandler1 == *defaultMessageHandler2);
     QVERIFY(same);
-    QtMessageHandler messageHandler = qInstallMessageHandler((QtMessageHandler)0);
+    QtMessageHandler messageHandler = qInstallMessageHandler((QtMessageHandler)0); // set 0, should set default and return myMessageHandler
     same = (*messageHandler == *myMessageHandler);
     QVERIFY(same);
 }
diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index 13f8ced842..19f4549706 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -194,6 +194,9 @@ void tst_QIODevice::unget()
 #if defined(Q_OS_WINCE) && defined(WINCE_EMULATOR_TEST)
     QSKIP("Networking tests in a WinCE emulator are unstable");
 #endif
+#if defined(Q_OS_MAC)
+    QSKIP("The unget network test is unstable on Mac. See QTBUG-39983.");
+#endif
     QBuffer buffer;
     buffer.open(QBuffer::ReadWrite);
     buffer.write("ZXCV");