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

Conflicts:
	config_help.txt
	configure
	mkspecs/features/uikit/sdk.prf
	src/corelib/global/qhooks.cpp
	src/corelib/io/qfilesystemwatcher.cpp
	src/corelib/io/qlockfile_unix.cpp
	src/corelib/tools/qalgorithms.h
	src/gui/kernel/qwindowsysteminterface.h
	src/gui/text/qtextdocument_p.cpp
	src/network/access/access.pri
	src/network/access/qnetworkaccessmanager.cpp
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/src.pro
	src/testlib/qtestcase.cpp
	src/widgets/kernel/qwidgetbackingstore_p.h
	src/widgets/styles/qwindowscestyle.cpp
	src/widgets/styles/qwindowsmobilestyle.cpp
	tests/auto/corelib/io/qdiriterator/qdiriterator.pro
	tests/auto/corelib/io/qfileinfo/qfileinfo.pro
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
	tools/configure/configureapp.cpp

Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67

18 files changed, 70 insertions, 656 deletions

diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index 94f8b7cbc0..ba0e448010 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -74,14 +74,4 @@ SOURCES += \
 
 mac: LIBS_PRIVATE += -framework Security
 
-uikit {
-    HEADERS += \
-        access/qnetworkreplynsurlconnectionimpl_p.h
-
-    OBJECTIVE_SOURCES += \
-        access/qnetworkreplynsurlconnectionimpl.mm
-
-    LIBS_PRIVATE += -framework Foundation
-}
-
 include($$PWD/../../3rdparty/zlib_dependency.pri)
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 56716cbe01..2f7be01078 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -331,7 +331,7 @@ bool QHttpNetworkConnectionChannel::ensureConnection()
             priv->phase = QAuthenticatorPrivate::Start;
 
         QString connectHost = connection->d_func()->hostName;
-        qint16 connectPort = connection->d_func()->port;
+        quint16 connectPort = connection->d_func()->port;
 
 #ifndef QT_NO_NETWORKPROXY
         // HTTPS always use transparent proxy.
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 1aa2d71bc5..9fee172283 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -56,10 +56,6 @@
 #include "qnetworkreplydataimpl_p.h"
 #include "qnetworkreplyfileimpl_p.h"
 
-#if defined(QT_PLATFORM_UIKIT) && defined(QT_NO_SSL)
-#include "qnetworkreplynsurlconnectionimpl_p.h"
-#endif
-
 #include "QtCore/qbuffer.h"
 #include "QtCore/qurl.h"
 #include "QtCore/qvector.h"
@@ -1207,12 +1203,6 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
         }
     }
 
-// Use NSURLConnection for https on iOS when OpenSSL is disabled.
-#if defined(QT_PLATFORM_UIKIT) && defined(QT_NO_SSL)
-    if (scheme == QLatin1String("https"))
-        return new QNetworkReplyNSURLConnectionImpl(this, request, op, outgoingData);
-#endif
-
 #ifndef QT_NO_HTTP
     // Since Qt 5 we use the new QNetworkReplyHttpImpl
     if (scheme == QLatin1String("http") || scheme == QLatin1String("preconnect-http")
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 7e8c399047..6df0b63ba7 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -94,6 +94,7 @@ public:
         NotAccessible = 0,
         Accessible = 1
     };
+    Q_ENUM(NetworkAccessibility)
 #endif
 
     explicit QNetworkAccessManager(QObject *parent = Q_NULLPTR);
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index e27391f760..30f4bb26ce 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -296,7 +296,7 @@ qint64 QNetworkReplyHttpImpl::bytesAvailable() const
 
     // if we load from cache device
     if (d->cacheLoadDevice) {
-        return QNetworkReply::bytesAvailable() + d->cacheLoadDevice->bytesAvailable() + d->downloadMultiBuffer.byteAmount();
+        return QNetworkReply::bytesAvailable() + d->cacheLoadDevice->bytesAvailable();
     }
 
     // zerocopy buffer
@@ -305,7 +305,7 @@ qint64 QNetworkReplyHttpImpl::bytesAvailable() const
     }
 
     // normal buffer
-    return QNetworkReply::bytesAvailable() + d->downloadMultiBuffer.byteAmount();
+    return QNetworkReply::bytesAvailable();
 }
 
 bool QNetworkReplyHttpImpl::isSequential () const
@@ -329,12 +329,6 @@ qint64 QNetworkReplyHttpImpl::readData(char* data, qint64 maxlen)
     if (d->cacheLoadDevice) {
         // FIXME bytesdownloaded, position etc?
 
-        // There is something already in the buffer we buffered before because the user did not read()
-        // anything, so we read there first:
-        if (!d->downloadMultiBuffer.isEmpty()) {
-            return d->downloadMultiBuffer.read(data, maxlen);
-        }
-
         qint64 ret = d->cacheLoadDevice->read(data, maxlen);
         return ret;
     }
@@ -351,25 +345,14 @@ qint64 QNetworkReplyHttpImpl::readData(char* data, qint64 maxlen)
     }
 
     // normal buffer
-    if (d->downloadMultiBuffer.isEmpty()) {
-        if (d->state == d->Finished || d->state == d->Aborted)
-            return -1;
-        return 0;
-    }
+    if (d->state == d->Finished || d->state == d->Aborted)
+        return -1;
 
-    if (maxlen == 1) {
-        // optimization for getChar()
-        *data = d->downloadMultiBuffer.getChar();
-        if (readBufferSize())
-            emit readBufferFreed(1);
-        return 1;
-    }
-
-    maxlen = qMin<qint64>(maxlen, d->downloadMultiBuffer.byteAmount());
-    qint64 bytesRead = d->downloadMultiBuffer.read(data, maxlen);
+    qint64 wasBuffered = d->bytesBuffered;
+    d->bytesBuffered = 0;
     if (readBufferSize())
-        emit readBufferFreed(bytesRead);
-    return bytesRead;
+        emit readBufferFreed(wasBuffered);
+    return 0;
 }
 
 void QNetworkReplyHttpImpl::setReadBufferSize(qint64 size)
@@ -387,12 +370,12 @@ bool QNetworkReplyHttpImpl::canReadLine () const
         return true;
 
     if (d->cacheLoadDevice)
-        return d->cacheLoadDevice->canReadLine() || d->downloadMultiBuffer.canReadLine();
+        return d->cacheLoadDevice->canReadLine();
 
     if (d->downloadZerocopyBuffer)
         return memchr(d->downloadZerocopyBuffer + d->downloadBufferReadPosition, '\n', d->downloadBufferCurrentSize - d->downloadBufferReadPosition);
 
-    return d->downloadMultiBuffer.canReadLine();
+    return false;
 }
 
 #ifndef QT_NO_SSL
@@ -444,6 +427,7 @@ QNetworkReplyHttpImplPrivate::QNetworkReplyHttpImplPrivate()
     , resumeOffset(0)
     , preMigrationDownloaded(-1)
     , bytesDownloaded(0)
+    , bytesBuffered(0)
     , downloadBufferReadPosition(0)
     , downloadBufferCurrentSize(0)
     , downloadZerocopyBuffer(0)
@@ -1047,10 +1031,11 @@ void QNetworkReplyHttpImplPrivate::replyDownloadData(QByteArray d)
             cacheSaveDevice->write(item.constData(), item.size());
 
         if (!isHttpRedirectResponse())
-            downloadMultiBuffer.append(item);
+            buffer.append(item);
 
         bytesWritten += item.size();
     }
+    bytesBuffered += bytesWritten;
     pendingDownloadDataCopy.clear();
 
     QVariant totalSize = cookedHeaders.value(QNetworkRequest::ContentLengthHeader);
@@ -1823,9 +1808,8 @@ void QNetworkReplyHttpImplPrivate::_q_cacheLoadReadyRead()
     // If there are still bytes available in the cacheLoadDevice then the user did not read
     // in response to the readyRead() signal. This means we have to load from the cacheLoadDevice
     // and buffer that stuff. This is needed to be able to properly emit finished() later.
-    while (cacheLoadDevice->bytesAvailable() && !isHttpRedirectResponse()) {
-        downloadMultiBuffer.append(cacheLoadDevice->readAll());
-    }
+    while (cacheLoadDevice->bytesAvailable() && !isHttpRedirectResponse())
+        buffer.append(cacheLoadDevice->readAll());
 
     if (cacheLoadDevice->isSequential()) {
         // check if end and we can read the EOF -1
diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h
index 669258f15b..4aba915c7d 100644
--- a/src/network/access/qnetworkreplyhttpimpl_p.h
+++ b/src/network/access/qnetworkreplyhttpimpl_p.h
@@ -240,12 +240,11 @@ public:
     quint64 resumeOffset;
     qint64 preMigrationDownloaded;
 
-    // Used for normal downloading. For "zero copy" the downloadZerocopyBuffer is used
-    QByteDataBuffer downloadMultiBuffer;
     QByteDataBuffer pendingDownloadData; // For signal compression
     qint64 bytesDownloaded;
+    qint64 bytesBuffered;
 
-    // only used when the "zero copy" style is used. Else downloadMultiBuffer is used.
+    // Only used when the "zero copy" style is used.
     // Please note that the whole "zero copy" download buffer API is private right now. Do not use it.
     qint64 downloadBufferReadPosition;
     qint64 downloadBufferCurrentSize;
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index d69d5983cb..54930a351a 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -184,17 +184,13 @@ void QNetworkReplyImplPrivate::_q_copyReadyRead()
             break;
 
         bytesToRead = qBound<qint64>(1, bytesToRead, copyDevice->bytesAvailable());
-        QByteArray byteData;
-        byteData.resize(bytesToRead);
-        qint64 bytesActuallyRead = copyDevice->read(byteData.data(), byteData.size());
+        qint64 bytesActuallyRead = copyDevice->read(buffer.reserve(bytesToRead), bytesToRead);
         if (bytesActuallyRead == -1) {
-            byteData.clear();
+            buffer.chop(bytesToRead);
             backendNotify(NotifyCopyFinished);
             break;
         }
-
-        byteData.resize(bytesActuallyRead);
-        readBuffer.append(byteData);
+        buffer.chop(bytesToRead - bytesActuallyRead);
 
         if (!copyDevice->isSequential() && copyDevice->atEnd()) {
             backendNotify(NotifyCopyFinished);
@@ -582,7 +578,7 @@ qint64 QNetworkReplyImplPrivate::nextDownstreamBlockSize() const
     if (readBufferMaxSize == 0)
         return DesiredBufferSize;
 
-    return qMax<qint64>(0, readBufferMaxSize - readBuffer.byteAmount());
+    return qMax<qint64>(0, readBufferMaxSize - buffer.size());
 }
 
 void QNetworkReplyImplPrivate::initCacheSaveDevice()
@@ -624,7 +620,7 @@ void QNetworkReplyImplPrivate::initCacheSaveDevice()
 }
 
 // we received downstream data and send this to the cache
-// and to our readBuffer (which in turn gets read by the user of QNetworkReply)
+// and to our buffer (which in turn gets read by the user of QNetworkReply)
 void QNetworkReplyImplPrivate::appendDownstreamData(QByteDataBuffer &data)
 {
     Q_Q(QNetworkReplyImpl);
@@ -641,7 +637,7 @@ void QNetworkReplyImplPrivate::appendDownstreamData(QByteDataBuffer &data)
 
         if (cacheSaveDevice)
             cacheSaveDevice->write(item.constData(), item.size());
-        readBuffer.append(item);
+        buffer.append(item);
 
         bytesWritten += item.size();
     }
@@ -975,13 +971,6 @@ void QNetworkReplyImpl::close()
     d->finished();
 }
 
-bool QNetworkReplyImpl::canReadLine () const
-{
-    Q_D(const QNetworkReplyImpl);
-    return QNetworkReply::canReadLine() || d->readBuffer.canReadLine();
-}
-
-
 /*!
     Returns the number of bytes available for reading with
     QIODevice::read(). The number of bytes available may grow until
@@ -996,14 +985,14 @@ qint64 QNetworkReplyImpl::bytesAvailable() const
         return QNetworkReply::bytesAvailable() + maxAvail;
     }
 
-    return QNetworkReply::bytesAvailable() + d_func()->readBuffer.byteAmount();
+    return QNetworkReply::bytesAvailable();
 }
 
 void QNetworkReplyImpl::setReadBufferSize(qint64 size)
 {
     Q_D(QNetworkReplyImpl);
     if (size > d->readBufferMaxSize &&
-        size > d->readBuffer.byteAmount())
+        size > d->buffer.size())
         d->backendNotify(QNetworkReplyImplPrivate::NotifyDownstreamReadyWrite);
 
     QNetworkReply::setReadBufferSize(size);
@@ -1061,19 +1050,12 @@ qint64 QNetworkReplyImpl::readData(char *data, qint64 maxlen)
     }
 
 
-    if (d->readBuffer.isEmpty())
-        return d->state == QNetworkReplyPrivate::Finished ? -1 : 0;
     // FIXME what about "Aborted" state?
+    if (d->state == QNetworkReplyPrivate::Finished)
+        return -1;
 
     d->backendNotify(QNetworkReplyImplPrivate::NotifyDownstreamReadyWrite);
-    if (maxlen == 1) {
-        // optimization for getChar()
-        *data = d->readBuffer.getChar();
-        return 1;
-    }
-
-    maxlen = qMin<qint64>(maxlen, d->readBuffer.byteAmount());
-    return d->readBuffer.read(data, maxlen);
+    return 0;
 }
 
 /*!
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h
index 156cb411c7..054cbcc3a7 100644
--- a/src/network/access/qnetworkreplyimpl_p.h
+++ b/src/network/access/qnetworkreplyimpl_p.h
@@ -81,7 +81,6 @@ public:
     virtual void close() Q_DECL_OVERRIDE;
     virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE;
     virtual void setReadBufferSize(qint64 size) Q_DECL_OVERRIDE;
-    virtual bool canReadLine () const Q_DECL_OVERRIDE;
 
     virtual qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
     virtual bool event(QEvent *) Q_DECL_OVERRIDE;
@@ -187,8 +186,6 @@ public:
     QList<QNetworkProxy> proxyList;
 #endif
 
-    // Used for normal downloading. For "zero copy" the downloadBuffer is used
-    QByteDataBuffer readBuffer;
     qint64 bytesDownloaded;
     qint64 lastBytesDownloaded;
     qint64 bytesUploaded;
@@ -199,7 +196,7 @@ public:
 
     State state;
 
-    // only used when the "zero copy" style is used. Else readBuffer is used.
+    // Only used when the "zero copy" style is used.
     // Please note that the whole "zero copy" download buffer API is private right now. Do not use it.
     qint64 downloadBufferReadPosition;
     qint64 downloadBufferCurrentSize;
diff --git a/src/network/access/qnetworkreplynsurlconnectionimpl.mm b/src/network/access/qnetworkreplynsurlconnectionimpl.mm
deleted file mode 100644
index 25b79e3347..0000000000
--- a/src/network/access/qnetworkreplynsurlconnectionimpl.mm
+++ /dev/null
@@ -1,454 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNetwork module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qnetworkreplynsurlconnectionimpl_p.h"
-
-#include "QtCore/qdatetime.h"
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qdebug.h>
-#include <Foundation/Foundation.h>
-
-QT_BEGIN_NAMESPACE
-
-// Network reply implementation using NSUrlConnection.
-//
-// Class/object structure:
-//
-// QNetworkReplyNSURLConnectionImpl
-//  |- QNetworkReplyNSURLConnectionImplPrivate
-//      |- (bytes read)
-//      |- (QIODevice and CFStream for async POST data transfer)
-//      |- NSURLConnection
-//      |- QtNSURLConnectionDelegate <NSURLConnectionDataDelegate>
-//          |- NSURLResponse/NSHTTPURLResponse
-//          |- (response data)
-//
-// The main entry point is the QNetworkReplyNSURLConnectionImpl constructor, which
-// receives a network request from QNetworkAccessManager. The constructor
-// creates a NSURLRequest and initiates a NSURLConnection with a QtNSURLConnectionDelegate.
-// The delegate callbacks are then called asynchronously as the request completes.
-//
-
-@class QtNSURLConnectionDelegate;
-class QNetworkReplyNSURLConnectionImplPrivate: public QNetworkReplyPrivate
-{
-public:
-    QNetworkReplyNSURLConnectionImplPrivate();
-    virtual ~QNetworkReplyNSURLConnectionImplPrivate();
-
-    Q_DECLARE_PUBLIC(QNetworkReplyNSURLConnectionImpl)
-    NSURLConnection * urlConnection;
-    QtNSURLConnectionDelegate *urlConnectionDelegate;
-    qint64 bytesRead;
-
-    // Sequental outgiong data streaming
-    QIODevice *outgoingData;
-    CFReadStreamRef readStream;
-    CFWriteStreamRef writeStream;
-    CFIndex transferBufferSize;
-
-    // Forwarding functions to the public class.
-    void setFinished();
-    void setHeader(QNetworkRequest::KnownHeaders header, const QVariant &value);
-    void setRawHeader(const QByteArray &headerName, const QByteArray &value);
-    void setError(QNetworkReply::NetworkError errorCode, const QString &errorString);
-    void setAttribute(QNetworkRequest::Attribute code, const QVariant &value);
-};
-
-@interface QtNSURLConnectionDelegate : NSObject
-{
-    NSURLResponse *response;
-    NSMutableData *responseData;
-    QNetworkReplyNSURLConnectionImplPrivate * replyprivate;
-}
-
-- (id)initWithQNetworkReplyNSURLConnectionImplPrivate:(QNetworkReplyNSURLConnectionImplPrivate *)a_replyPrivate ;
-- (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
-- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError*)error;
-- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse*)response;
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData*)data;
-- (void)connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten
-      totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite;
-- (NSCachedURLResponse*)connection:(NSURLConnection*)connection willCacheResponse:(NSCachedURLResponse*)cachedResponse;
-- (NSURLRequest*)connection:(NSURLConnection*)connection willSendRequest:(NSURLRequest*)request redirectResponse:(NSURLResponse*)redirectResponse;
-- (void)connectionDidFinishLoading:(NSURLConnection*)connection;
-- (BOOL)connectionShouldUseCredentialStorage:(NSURLConnection*)connection;
-
-@end
-
-QNetworkReplyNSURLConnectionImplPrivate::QNetworkReplyNSURLConnectionImplPrivate()
-    : QNetworkReplyPrivate()
-    , urlConnection(0)
-    , urlConnectionDelegate(0)
-    , bytesRead(0)
-    , readStream(0)
-    , writeStream(0)
-    , transferBufferSize(4096)
-{
-}
-
-QNetworkReplyNSURLConnectionImplPrivate::~QNetworkReplyNSURLConnectionImplPrivate()
-{
-    [urlConnection cancel];
-    [urlConnection release];
-    [urlConnectionDelegate release];
-    if (readStream)
-        CFRelease(readStream);
-    if (writeStream)
-        CFRelease(writeStream);
-}
-
-void QNetworkReplyNSURLConnectionImplPrivate::setFinished()
-{
-    q_func()->setFinished(true);
-    QMetaObject::invokeMethod(q_func(), "finished", Qt::QueuedConnection);
-}
-
-void QNetworkReplyNSURLConnectionImplPrivate::setHeader(QNetworkRequest::KnownHeaders header, const QVariant &value)
-{
-    q_func()->setHeader(header, value);
-}
-
-void QNetworkReplyNSURLConnectionImplPrivate::setRawHeader(const QByteArray &headerName, const QByteArray &value)
-{
-    q_func()->setRawHeader(headerName, value);
-}
-
-void QNetworkReplyNSURLConnectionImplPrivate::setError(QNetworkReply::NetworkError errorCode, const QString &errorString)
-{
-    q_func()->setError(errorCode, errorString);
-}
-
-void QNetworkReplyNSURLConnectionImplPrivate::setAttribute(QNetworkRequest::Attribute code, const QVariant &value)
-{
-    q_func()->setAttribute(code, value);
-}
-
-void QNetworkReplyNSURLConnectionImpl::readyReadOutgoingData()
-{
-    Q_D(QNetworkReplyNSURLConnectionImpl);
-    int bytesRead = 0;
-    do {
-        char data[d->transferBufferSize];
-        bytesRead = d->outgoingData->read(data, d->transferBufferSize);
-        if (bytesRead <= 0)
-            break;
-        CFIndex bytesWritten = CFWriteStreamWrite(d->writeStream, reinterpret_cast<unsigned char *>(data), bytesRead);
-        if (bytesWritten != bytesRead) {
-            CFErrorRef err = CFWriteStreamCopyError(d->writeStream);
-            qWarning() << "QNetworkReplyNSURLConnectionImpl: CFWriteStreamWrite error"
-                       << (err ? QString::number(CFErrorGetCode(err)) : QStringLiteral(""));
-        }
-    } while (bytesRead > 0);
-
-    if (d->outgoingData->atEnd())
-        CFWriteStreamClose(d->writeStream);
-}
-
-@interface QtNSURLConnectionDelegate ()
-
-@property (nonatomic, retain) NSURLResponse* response;
-@property (nonatomic, retain) NSMutableData* responseData;
-
-@end
-
-@implementation QtNSURLConnectionDelegate
-
-@synthesize response;
-@synthesize responseData;
-
-- (id)initWithQNetworkReplyNSURLConnectionImplPrivate:(QNetworkReplyNSURLConnectionImplPrivate *)a_replyPrivate
-{
-    if (self = [super init])
-        replyprivate = a_replyPrivate;
-    return self;
-}
-
-- (void)dealloc
-{
-    [response release];
-    [responseData release];
-    [super dealloc];
-}
-
-- (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
-{
-    Q_UNUSED(connection)
-    Q_UNUSED(challenge)
-
-    if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
-        SecTrustRef serverTrust = challenge.protectionSpace.serverTrust;
-        SecTrustResultType resultType;
-        SecTrustEvaluate(serverTrust, &resultType);
-        if (resultType == kSecTrustResultUnspecified) {
-            // All good
-            [challenge.sender performDefaultHandlingForAuthenticationChallenge:challenge];
-        } else if (resultType == kSecTrustResultRecoverableTrustFailure) {
-            // Certificate verification error, ask user
-            // ### TODO actually ask user
-            // (test site: https://testssl-expire.disig.sk/index.en.html)
-            qWarning()  << "QNetworkReplyNSURLConnection: Certificate verification error handlig is"
-                        << "not implemented. Connection will time out.";
-        } else {
-            // other error, which the default handler will handle
-            [challenge.sender performDefaultHandlingForAuthenticationChallenge:challenge];
-        }
-    }
-
-    [challenge.sender performDefaultHandlingForAuthenticationChallenge:challenge];
-}
-
-- (void)connection:(NSURLConnection*)connection didFailWithError:(NSError*)error
-{
-    Q_UNUSED(connection)
-
-    QNetworkReply::NetworkError qtError = QNetworkReply::UnknownNetworkError;
-    if ([[error domain] isEqualToString:NSURLErrorDomain]) {
-        switch ([error code]) {
-        case NSURLErrorTimedOut: qtError = QNetworkReply::TimeoutError; break;
-        case NSURLErrorUnsupportedURL: qtError = QNetworkReply::ProtocolUnknownError; break;
-        case NSURLErrorCannotFindHost: qtError = QNetworkReply::HostNotFoundError; break;
-        case NSURLErrorCannotConnectToHost: qtError = QNetworkReply::ConnectionRefusedError; break;
-        case NSURLErrorNetworkConnectionLost: qtError = QNetworkReply::NetworkSessionFailedError; break;
-        case NSURLErrorDNSLookupFailed: qtError = QNetworkReply::HostNotFoundError; break;
-        case NSURLErrorNotConnectedToInternet: qtError = QNetworkReply::NetworkSessionFailedError; break;
-        case NSURLErrorUserAuthenticationRequired: qtError = QNetworkReply::AuthenticationRequiredError; break;
-        default: break;
-        }
-    }
-
-    replyprivate->setError(qtError, QString::fromNSString([error localizedDescription]));
-    replyprivate->setFinished();
-}
-
-- (void)connection:(NSURLConnection*)connection didReceiveResponse:(NSURLResponse*)aResponse
-{
-    Q_UNUSED(connection)
-        self.response = aResponse;
-    self.responseData = [NSMutableData data];
-
-    // copy headers
-    if ([aResponse isKindOfClass:[NSHTTPURLResponse class]]) {
-        NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse*)aResponse;
-        NSDictionary *headers = [httpResponse allHeaderFields];
-        for (NSString *key in headers) {
-            NSString *value = [headers objectForKey:key];
-            replyprivate->setRawHeader(QString::fromNSString(key).toUtf8(), QString::fromNSString(value).toUtf8());
-        }
-
-        int code = [httpResponse statusCode];
-        replyprivate->setAttribute(QNetworkRequest::HttpStatusCodeAttribute, code);
-    } else {
-        if ([aResponse expectedContentLength] != NSURLResponseUnknownLength)
-            replyprivate->setHeader(QNetworkRequest::ContentLengthHeader, [aResponse expectedContentLength]);
-    }
-
-    QMetaObject::invokeMethod(replyprivate->q_func(), "metaDataChanged", Qt::QueuedConnection);
-}
-
-- (void)connection:(NSURLConnection*)connection didReceiveData:(NSData*)data
-{
-     Q_UNUSED(connection)
-         [responseData appendData:data];
-
-    if ([response expectedContentLength] != NSURLResponseUnknownLength) {
-        QMetaObject::invokeMethod(replyprivate->q_func(), "downloadProgress", Qt::QueuedConnection,
-            Q_ARG(qint64, qint64([responseData length] + replyprivate->bytesRead)),
-            Q_ARG(qint64, qint64([response expectedContentLength])));
-    }
-
-    QMetaObject::invokeMethod(replyprivate->q_func(), "readyRead", Qt::QueuedConnection);
-}
-
-- (void)connection:(NSURLConnection*)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten
-  totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite
-{
-    Q_UNUSED(connection)
-    Q_UNUSED(bytesWritten)
-    QMetaObject::invokeMethod(replyprivate->q_func(), "uploadProgress", Qt::QueuedConnection,
-        Q_ARG(qint64, qint64(totalBytesWritten)),
-        Q_ARG(qint64, qint64(totalBytesExpectedToWrite)));
-}
-
-- (NSCachedURLResponse*)connection:(NSURLConnection*)connection willCacheResponse:(NSCachedURLResponse*)cachedResponse
-{
-    Q_UNUSED(connection)
-    return cachedResponse;
-}
-
-- (NSURLRequest*)connection:(NSURLConnection*)connection willSendRequest:(NSURLRequest*)request redirectResponse:(NSURLResponse*)redirectResponse
-{
-    Q_UNUSED(connection)
-    Q_UNUSED(redirectResponse)
-        return request;
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection*)connection
-{
-    Q_UNUSED(connection)
-    replyprivate->setFinished();
-}
-
-- (BOOL)connectionShouldUseCredentialStorage:(NSURLConnection*)connection
-{
-    Q_UNUSED(connection)
-    return YES;
-}
-
-@end
-
-QNetworkReplyNSURLConnectionImpl::~QNetworkReplyNSURLConnectionImpl()
-{
-}
-
-QNetworkReplyNSURLConnectionImpl::QNetworkReplyNSURLConnectionImpl(QObject *parent,
-    const QNetworkRequest &request, const QNetworkAccessManager::Operation operation, QIODevice* outgoingData)
-    : QNetworkReply(*new QNetworkReplyNSURLConnectionImplPrivate(), parent)
-{
-    setRequest(request);
-    setUrl(request.url());
-    setOperation(operation);
-    QNetworkReply::open(QIODevice::ReadOnly);
-
-    QNetworkReplyNSURLConnectionImplPrivate *d = (QNetworkReplyNSURLConnectionImplPrivate*) d_func();
-
-    QUrl url = request.url();
-    if (url.host() == QLatin1String("localhost"))
-        url.setHost(QString());
-
-    if (url.path().isEmpty())
-        url.setPath(QLatin1String("/"));
-    setUrl(url);
-
-    // Create a NSMutableURLRequest from QNetworkRequest
-    NSMutableURLRequest *nsRequest = [NSMutableURLRequest requestWithURL:request.url().toNSURL()
-                                             cachePolicy:NSURLRequestUseProtocolCachePolicy
-                                             timeoutInterval:60.0];
-    // copy headers
-    const auto headers = request.rawHeaderList();
-    for (const QByteArray &header : headers) {
-        QByteArray headerValue = request.rawHeader(header);
-        [nsRequest addValue:QString::fromUtf8(headerValue).toNSString()
-                 forHTTPHeaderField:QString::fromUtf8(header).toNSString()];
-    }
-
-    if (operation == QNetworkAccessManager::GetOperation)
-        [nsRequest setHTTPMethod:@"GET"];
-    else if (operation == QNetworkAccessManager::PostOperation)
-        [nsRequest setHTTPMethod:@"POST"];
-    else if (operation == QNetworkAccessManager::PutOperation)
-        [nsRequest setHTTPMethod:@"PUT"];
-    else if (operation == QNetworkAccessManager::DeleteOperation)
-        [nsRequest setHTTPMethod:@"DELETE"];
-    else
-        qWarning() << "QNetworkReplyNSURLConnection: Unsupported netork operation" << operation;
-
-    if (outgoingData) {
-        d->outgoingData = outgoingData;
-        if (outgoingData->isSequential()) {
-            // set up streaming from outgoingData iodevice to request
-            CFStreamCreateBoundPair(kCFAllocatorDefault, &d->readStream, &d->writeStream, d->transferBufferSize);
-            CFWriteStreamOpen(d->writeStream);
-            [nsRequest setHTTPBodyStream:reinterpret_cast<NSInputStream *>(d->readStream)];
-            connect(outgoingData, SIGNAL(readyRead()), this, SLOT(readyReadOutgoingData()));
-            readyReadOutgoingData();
-        } else {
-            // move all data at once
-            QByteArray data = outgoingData->readAll();
-            [nsRequest setHTTPBody:[NSData dataWithBytes:data.constData() length:data.length()]];
-        }
-    }
-
-    // Create connection
-    d->urlConnectionDelegate = [[QtNSURLConnectionDelegate alloc] initWithQNetworkReplyNSURLConnectionImplPrivate:d];
-    d->urlConnection = [[NSURLConnection alloc] initWithRequest:nsRequest delegate:d->urlConnectionDelegate];
-    if (!d->urlConnection) {
-        // ### what type of error is an initWithRequest fail?
-        setError(QNetworkReply::ProtocolUnknownError, QStringLiteral("QNetworkReplyNSURLConnection internal error"));
-    }
-}
-
-void QNetworkReplyNSURLConnectionImpl::close()
-{
-    // No-op? Network ops should continue (especially POSTs)
-    QNetworkReply::close();
-}
-
-void QNetworkReplyNSURLConnectionImpl::abort()
-{
-    Q_D(QNetworkReplyNSURLConnectionImpl);
-    [d->urlConnection cancel];
-    QNetworkReply::close();
-}
-
-qint64 QNetworkReplyNSURLConnectionImpl::bytesAvailable() const
-{
-    Q_D(const QNetworkReplyNSURLConnectionImpl);
-    qint64 available = QNetworkReply::bytesAvailable() +
-              [[d->urlConnectionDelegate responseData] length];
-    return available;
-}
-
-bool QNetworkReplyNSURLConnectionImpl::isSequential() const
-{
-    return true;
-}
-
-qint64 QNetworkReplyNSURLConnectionImpl::size() const
-{
-    Q_D(const QNetworkReplyNSURLConnectionImpl);
-    return [[d->urlConnectionDelegate responseData] length] + d->bytesRead;
-}
-
-/*!
-    \internal
-*/
-qint64 QNetworkReplyNSURLConnectionImpl::readData(char *data, qint64 maxlen)
-{
-    Q_D(QNetworkReplyNSURLConnectionImpl);
-    qint64 dataSize = [[d->urlConnectionDelegate responseData] length];
-    qint64 canRead = qMin(maxlen, dataSize);
-    const char *sourceBase = static_cast<const char *>([[d->urlConnectionDelegate responseData] bytes]);
-    memcpy(data,  sourceBase, canRead);
-    [[d->urlConnectionDelegate responseData] replaceBytesInRange:NSMakeRange(0, canRead) withBytes:NULL length:0];
-    d->bytesRead += canRead;
-    return canRead;
-}
-
-QT_END_NAMESPACE
diff --git a/src/network/access/qnetworkreplynsurlconnectionimpl_p.h b/src/network/access/qnetworkreplynsurlconnectionimpl_p.h
deleted file mode 100644
index c948e66629..0000000000
--- a/src/network/access/qnetworkreplynsurlconnectionimpl_p.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNetwork module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QNETWORKREPLYNSURLCONNECTIONIMPL_H
-#define QNETWORKREPLYNSURLCONNECTIONIMPL_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of the Network Access API.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qnetworkreply.h"
-#include "qnetworkreply_p.h"
-#include "qnetworkaccessmanager.h"
-#include <QFile>
-#include <private/qabstractfileengine_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QNetworkReplyNSURLConnectionImplPrivate;
-class QNetworkReplyNSURLConnectionImpl: public QNetworkReply
-{
-    Q_OBJECT
-public:
-    QNetworkReplyNSURLConnectionImpl(QObject *parent, const QNetworkRequest &req, const QNetworkAccessManager::Operation op, QIODevice* outgoingData);
-    virtual ~QNetworkReplyNSURLConnectionImpl();
-    virtual void abort();
-
-    // reimplemented from QNetworkReply
-    virtual void close();
-    virtual qint64 bytesAvailable() const;
-    virtual bool isSequential () const;
-    qint64 size() const;
-
-    virtual qint64 readData(char *data, qint64 maxlen);
-public Q_SLOTS:
-    void readyReadOutgoingData();
-
-    Q_DECLARE_PRIVATE(QNetworkReplyNSURLConnectionImpl)
-};
-
-QT_END_NAMESPACE
-
-#endif // QNetworkReplyNSURLConnectionImpl_H
diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp
index 35981a2f2c..41038dc8da 100644
--- a/src/network/kernel/qdnslookup_unix.cpp
+++ b/src/network/kernel/qdnslookup_unix.cpp
@@ -47,7 +47,9 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <arpa/nameser_compat.h>
+#if !defined(Q_OS_OPENBSD)
+#  include <arpa/nameser_compat.h>
+#endif
 #include <resolv.h>
 
 #if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__)
@@ -58,6 +60,9 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_LIBRARY
 
+#if defined(Q_OS_OPENBSD)
+typedef struct __res_state* res_state;
+#endif
 typedef int (*dn_expand_proto)(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
 static dn_expand_proto local_dn_expand = 0;
 typedef void (*res_nclose_proto)(res_state);
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 757a6ad0b0..681c81d6eb 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -115,14 +115,13 @@ public:
     QString ipString;
     QString scopeId;
 
-    quint32 a;    // IPv4 address
     union {
         Q_IPV6ADDR a6; // IPv6 address
         struct { quint64 c[2]; } a6_64;
         struct { quint32 c[4]; } a6_32;
     };
-    QAbstractSocket::NetworkLayerProtocol protocol;
-
+    quint32 a;    // IPv4 address
+    qint8 protocol;
     bool isParsed;
 
     friend class QHostAddress;
@@ -735,7 +734,7 @@ quint32 QHostAddress::toIPv4Address(bool *ok) const
 QAbstractSocket::NetworkLayerProtocol QHostAddress::protocol() const
 {
     QT_ENSURE_PARSED(this);
-    return d->protocol;
+    return QAbstractSocket::NetworkLayerProtocol(d->protocol);
 }
 
 /*!
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index b3e456be69..7ef9d7f26b 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -560,7 +560,9 @@ int QNativeSocketEnginePrivate::nativeAccept()
             setError(QAbstractSocket::SocketResourceError, NotSocketErrorString);
             break;
         case EPROTONOSUPPORT:
+#if !defined(Q_OS_OPENBSD)
         case EPROTO:
+#endif
         case EAFNOSUPPORT:
         case EINVAL:
             setError(QAbstractSocket::UnsupportedSocketOperationError, ProtocolUnsupportedErrorString);
@@ -900,7 +902,9 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxS
             if (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_RECVIF
                     && cmsgptr->cmsg_len >= CMSG_LEN(sizeof(sockaddr_dl))) {
                 sockaddr_dl *sdl = reinterpret_cast<sockaddr_dl *>(CMSG_DATA(cmsgptr));
-
+#    if defined(Q_OS_OPENBSD)
+#      define LLINDEX(s) ((s)->sdl_index)
+#    endif
                 header->ifindex = LLINDEX(sdl);
             }
 #  endif
diff --git a/src/network/socket/qnativesocketengine_winrt.cpp b/src/network/socket/qnativesocketengine_winrt.cpp
index 181c49f200..dd43615f98 100644
--- a/src/network/socket/qnativesocketengine_winrt.cpp
+++ b/src/network/socket/qnativesocketengine_winrt.cpp
@@ -337,7 +337,7 @@ bool QNativeSocketEngine::connectToHostByName(const QString &name, quint16 port)
     d->socketState = QAbstractSocket::ConnectingState;
     hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
         return d->connectOp->put_Completed(Callback<IAsyncActionCompletedHandler>(
-                                         d, &QNativeSocketEnginePrivate::handleConnectToHost).Get());
+                                         d, &QNativeSocketEnginePrivate::handleConnectOpFinished).Get());
     });
     Q_ASSERT_SUCCEEDED(hr);
 
@@ -477,7 +477,10 @@ void QNativeSocketEngine::close()
             hr = socket3->CancelIOAsync(&action);
             Q_ASSERT_SUCCEEDED(hr);
             hr = QWinRTFunctions::await(action);
-            Q_ASSERT_SUCCEEDED(hr);
+            // If there is no pending IO (no read established before) the function will fail with
+            // "function was called at an unexpected time" which is fine.
+            if (hr != E_ILLEGAL_METHOD_CALL)
+                Q_ASSERT_SUCCEEDED(hr);
             return S_OK;
         });
         Q_ASSERT_SUCCEEDED(hr);
@@ -759,7 +762,7 @@ bool QNativeSocketEngine::waitForWrite(int msecs, bool *timedOut)
     if (d->socketState == QAbstractSocket::ConnectingState) {
         HRESULT hr = QWinRTFunctions::await(d->connectOp, QWinRTFunctions::ProcessMainThreadEvents);
         if (SUCCEEDED(hr)) {
-            d->handleConnectionEstablished(d->connectOp.Get());
+            d->handleConnectOpFinished(d->connectOp.Get(), Completed);
             return true;
         }
     }
@@ -1214,38 +1217,32 @@ HRESULT QNativeSocketEnginePrivate::handleClientConnection(IStreamSocketListener
     return S_OK;
 }
 
-HRESULT QNativeSocketEnginePrivate::handleConnectToHost(IAsyncAction *action, AsyncStatus)
-{
-    handleConnectionEstablished(action);
-    return S_OK;
-}
-
-void QNativeSocketEnginePrivate::handleConnectionEstablished(IAsyncAction *action)
+HRESULT QNativeSocketEnginePrivate::handleConnectOpFinished(IAsyncAction *action, AsyncStatus)
 {
     Q_Q(QNativeSocketEngine);
     if (wasDeleted || !connectOp) // Protect against a late callback
-        return;
+        return S_OK;
 
     HRESULT hr = action->GetResults();
     switch (hr) {
     case 0x8007274c: // A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
         setError(QAbstractSocket::NetworkError, ConnectionTimeOutErrorString);
         socketState = QAbstractSocket::UnconnectedState;
-        break;
+        return S_OK;
     case 0x80072751: // A socket operation was attempted to an unreachable host.
         setError(QAbstractSocket::HostNotFoundError, HostUnreachableErrorString);
         socketState = QAbstractSocket::UnconnectedState;
-        break;
+        return S_OK;
     case 0x8007274d: // No connection could be made because the target machine actively refused it.
         setError(QAbstractSocket::ConnectionRefusedError, ConnectionRefusedErrorString);
         socketState = QAbstractSocket::UnconnectedState;
-        break;
+        return S_OK;
     default:
         if (FAILED(hr)) {
             setError(QAbstractSocket::UnknownSocketError, UnknownSocketErrorString);
             socketState = QAbstractSocket::UnconnectedState;
+            return S_OK;
         }
-        break;
     }
 
     // The callback might be triggered several times if we do not cancel/reset it here
@@ -1267,13 +1264,14 @@ void QNativeSocketEnginePrivate::handleConnectionEstablished(IAsyncAction *actio
     emit q->connectionReady();
 
     if (socketType != QAbstractSocket::TcpSocket)
-        return;
+        return S_OK;
 
     // Delay the reader so that the SSL socket can upgrade
     if (sslSocket)
         QObject::connect(qobject_cast<QSslSocket *>(sslSocket), &QSslSocket::encrypted, q, &QNativeSocketEngine::establishRead);
     else
         q->establishRead();
+    return S_OK;
 }
 
 HRESULT QNativeSocketEnginePrivate::handleReadyRead(IAsyncBufferOperation *asyncInfo, AsyncStatus status)
diff --git a/src/network/socket/qnativesocketengine_winrt_p.h b/src/network/socket/qnativesocketengine_winrt_p.h
index 325e4965e6..5b76c2d223 100644
--- a/src/network/socket/qnativesocketengine_winrt_p.h
+++ b/src/network/socket/qnativesocketengine_winrt_p.h
@@ -220,8 +220,7 @@ private:
                               ABI::Windows::Networking::Sockets::IDatagramSocketMessageReceivedEventArgs *args);
     HRESULT handleClientConnection(ABI::Windows::Networking::Sockets::IStreamSocketListener *tcpListener,
                                    ABI::Windows::Networking::Sockets::IStreamSocketListenerConnectionReceivedEventArgs *args);
-    HRESULT handleConnectToHost(ABI::Windows::Foundation::IAsyncAction *, ABI::Windows::Foundation::AsyncStatus);
-    void handleConnectionEstablished(ABI::Windows::Foundation::IAsyncAction *action);
+    HRESULT handleConnectOpFinished(ABI::Windows::Foundation::IAsyncAction *, ABI::Windows::Foundation::AsyncStatus);
     HRESULT handleReadyRead(ABI::Windows::Foundation::IAsyncOperationWithProgress<ABI::Windows::Storage::Streams::IBuffer *, UINT32> *asyncInfo, ABI::Windows::Foundation::AsyncStatus);
 };
 
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index 1870091693..ee3e0d9f0e 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -1118,7 +1118,9 @@ bool QSocks5SocketEngine::connectInternal()
     }
 
     if (d->socketState != QAbstractSocket::ConnectingState) {
-        if (d->socks5State == QSocks5SocketEnginePrivate::Uninitialized) {
+        if (d->socks5State == QSocks5SocketEnginePrivate::Uninitialized
+            // We may have new auth credentials since an earlier failure:
+         || d->socks5State == QSocks5SocketEnginePrivate::AuthenticatingError) {
             setState(QAbstractSocket::ConnectingState);
             //limit buffer in internal socket, data is buffered in the external socket under application control
             d->data->controlSocket->setReadBufferSize(65536);
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 75a38db5f9..580b0fbdde 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -2642,7 +2642,8 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
                                << "/var/ssl/certs/" // AIX
                                << "/usr/local/ssl/certs/" // Solaris
                                << "/etc/openssl/certs/" // BlackBerry
-                               << "/opt/openssl/certs/"; // HP-UX
+                               << "/opt/openssl/certs/" // HP-UX
+                               << "/etc/ssl/"; // OpenBSD
 }
 
 /*!
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index c1ea10aefb..35d7654730 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -1344,8 +1344,12 @@ void QSslSocketBackendPrivate::_q_caRootLoaded(QSslCertificate cert, QSslCertifi
     if (plainSocket)
         plainSocket->resume();
     paused = false;
-    if (checkSslErrors() && ssl)
+    if (checkSslErrors() && ssl) {
+        bool willClose = (autoStartHandshake && pendingClose);
         continueHandshake();
+        if (!willClose)
+            transmit();
+    }
 }
 
 class QWindowsCaRootFetcherThread : public QThread