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

3 files changed, 5 insertions, 1 deletions

diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
index a70b07e389..1a882733a3 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -1397,6 +1397,7 @@ void tst_QLocale::fpExceptions()
     // check that double-to-string conversion doesn't throw floating point exceptions when they are
     // enabled
 #ifdef Q_OS_WIN
+    _clear87();
     unsigned int oldbits = _control87(0, 0);
     _control87( 0 | _EM_INEXACT, _MCW_EM );
 #endif
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 430f9b7575..e26700071b 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -6518,6 +6518,9 @@ void tst_QNetworkReply::sslSessionSharing()
     QNetworkRequest warmupRequest(urlString);
     QFETCH(bool, sessionSharingEnabled);
     warmupRequest.setAttribute(QNetworkRequest::User, sessionSharingEnabled); // so we can read it from the slot
+    // Make sure the socket is closed when the request is finished to guarantee that
+    // the _socket_ is not reused, but rather the ssl session
+    warmupRequest.setRawHeader("Connection", "close");
     if (! sessionSharingEnabled) {
         QSslConfiguration configuration(QSslConfiguration::defaultConfiguration());
         configuration.setSslOption(QSsl::SslOptionDisableSessionSharing, true);
diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 85eec6e783..009c5b7240 100644
--- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -309,7 +309,7 @@ void tst_QSocks5SocketEngine::simpleConnectToIMAP()
     QCOMPARE(socketDevice.peerAddress(), QtNetworkSettings::imapServerIp());
 
     // Wait for the greeting
-    QVERIFY(socketDevice.waitForRead());
+    QVERIFY2(socketDevice.waitForRead(), qPrintable("Socket error:" + socketDevice.errorString()));
 
     // Read the greeting
     qint64 available = socketDevice.bytesAvailable();