diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-02-02 15:51:26 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 17:11:37 +0100 |
| commit | ddf21c384f91ff58c01c2d08c95cb42c8eecabc9 (patch) | |
| tree | 7f8b0492e995db9050465f8c09bc1a5fa56ebf1c /src/network/ssl/qsslsocket.h | |
| parent | ea8e048e1dc6094fc66143a8ee4a9cd6bdf3a952 (diff) | |
Fix unintended source compatiblity break in QSslSocket
QSslSocket overrides one version of QAbstractSocket::connectToHost.
Since these functions were made virtual, this now hides the other
overloads.
Added a using statement to make the other overloads visible.
Change-Id: Ia48fdc9bd67936c75c25bb24dabd26a723bb7a05
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/ssl/qsslsocket.h')
| -rw-r--r-- | src/network/ssl/qsslsocket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index acd3664a54..bdc9c4b4cf 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -90,6 +90,7 @@ public: bool setSocketDescriptor(qintptr socketDescriptor, SocketState state = ConnectedState, OpenMode openMode = ReadWrite); + using QAbstractSocket::connectToHost; void connectToHost(const QString &hostName, quint16 port, OpenMode openMode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol); void disconnectFromHost(); |