From ddf21c384f91ff58c01c2d08c95cb42c8eecabc9 Mon Sep 17 00:00:00 2001
From: Shane Kearns <ext-shane.2.kearns@nokia.com>
Date: Thu, 2 Feb 2012 15:51:26 +0000
Subject: 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>
---
 src/network/ssl/qsslsocket.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/network')

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();
 
-- 
cgit v1.2.3