Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ia0f7f0f1511f9f593c6d4585c859d1bf1353540d

1 files changed, 11 insertions, 5 deletions

diff --git a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
index 5be00630ca..1ef9382f0a 100644
--- a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
+++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
@@ -530,11 +530,17 @@ void tst_PlatformSocketEngine::tooManySockets()
 void tst_PlatformSocketEngine::bind()
 {
 #if !defined Q_OS_WIN
-    PLATFORMSOCKETENGINE binder;
-    QVERIFY(binder.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
-    QVERIFY(!binder.bind(QHostAddress::AnyIPv4, 82));
-    QCOMPARE(binder.error(), QAbstractSocket::SocketAccessError);
-#endif
+#if defined Q_OS_MACOS
+    // On macOS >= 10.14 the bind on this port is successful.
+    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave)
+#endif // Q_OS_MACOS
+    {
+        PLATFORMSOCKETENGINE binder;
+        QVERIFY(binder.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
+        QVERIFY(!binder.bind(QHostAddress::AnyIPv4, 82));
+        QCOMPARE(binder.error(), QAbstractSocket::SocketAccessError);
+    }
+#endif // Q_OS_WIN
 
     PLATFORMSOCKETENGINE binder2;
     QVERIFY(binder2.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));