diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-01-26 17:19:18 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-28 14:44:48 +0100 |
| commit | dd7336571823ec626ba3d10a13bc49a73de53116 (patch) | |
| tree | 1c0375f916febcf54be68c3b9da35a7ed7e8c459 /src | |
| parent | 7c853db64239682fae2c34c6e48f847cc0042a7a (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/qsslsocket.h | 5 |
1 files changed, 2 insertions, 3 deletions
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; |