Fix unintended source compatiblity break in QSslSocket
authorShane Kearns <ext-shane.2.kearns@nokia.com>
Thu, 2 Feb 2012 15:51:26 +0000 (15:51 +0000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 2 Feb 2012 16:11:37 +0000 (17:11 +0100)
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>
src/network/ssl/qsslsocket.h

index acd3664..bdc9c4b 100644 (file)
@@ -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();