diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-09 17:59:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-09 17:59:51 +0200 |
| commit | 22e96c4d342de3bfe4fc27f4cd7233edcfe737cc (patch) | |
| tree | 6bdd02cdd8603cf16383fb339a2cfdbce82491da /src/network | |
| parent | bd79c4e28c307ba87aca02155b845774c7ffec1f (diff) | |
| parent | fa95eb055401f5264cbc6aca761cb9b5feb4affc (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I36e6b890b65d12bf6931757540bcc9c553b5eb8f
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qlocalsocket_tcp.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket_mac_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 4348b819d9..379cdd096d 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -245,8 +245,8 @@ void QLocalSocket::connectToServer(OpenMode openMode) QLatin1String("QLocalSocket::connectToServer")); return; } - d->tcpSocket->connectToHost(QHostAddress::LocalHost, port, openMode); QIODevice::open(openMode); + d->tcpSocket->connectToHost(QHostAddress::LocalHost, port, openMode); } bool QLocalSocket::setSocketDescriptor(qintptr socketDescriptor, diff --git a/src/network/ssl/qsslsocket_mac_p.h b/src/network/ssl/qsslsocket_mac_p.h index 5210fb7f30..9e1d18981e 100644 --- a/src/network/ssl/qsslsocket_mac_p.h +++ b/src/network/ssl/qsslsocket_mac_p.h @@ -75,7 +75,7 @@ public: private: SSLContextRef context; - Q_DISABLE_COPY(QSecureTransportContext); + Q_DISABLE_COPY(QSecureTransportContext) }; class QSslSocketBackendPrivate : public QSslSocketPrivate @@ -122,7 +122,7 @@ private: QSecureTransportContext context; - Q_DISABLE_COPY(QSslSocketBackendPrivate); + Q_DISABLE_COPY(QSslSocketBackendPrivate) }; QT_END_NAMESPACE |