From dd7336571823ec626ba3d10a13bc49a73de53116 Mon Sep 17 00:00:00 2001 From: "Jonas M. Gastal" Date: Thu, 26 Jan 2012 17:19:18 -0200 Subject: Making socketOption/setSocketOption virtual on QSslSocket. Per ### Qt5 comment and the fact that it was already virtual on QAbstractSocket. Change-Id: If2d2b2f9cdec1ef4c5bf625e3ce0d6f2d9a7bdfd Reviewed-by: Thiago Macieira --- src/network/ssl/qsslsocket.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 27cdbdeb5a..31f59ffb78 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -93,9 +93,8 @@ public: void connectToHost(const QString &hostName, quint16 port, OpenMode openMode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol); void disconnectFromHost(); - // ### Qt 5: Make virtual - void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value); - QVariant socketOption(QAbstractSocket::SocketOption option); + virtual void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value); + virtual QVariant socketOption(QAbstractSocket::SocketOption option); SslMode mode() const; bool isEncrypted() const; -- cgit v1.2.3