diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-02-20 17:02:41 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 15:28:40 +0100 |
| commit | 3f91cde588ad32277ba06d625ed36256ec65f88e (patch) | |
| tree | 6e8a7692743cf64cd77721f466558a7180dae3a3 /src/network/socket | |
| parent | 3fe79f23a97323521eb0182f8b46b0d0fc9ce44b (diff) | |
Test for QT_NO_SSL instead of QT_NO_OPENSSL
Change the ifdefs in our own code (except openssl backend) to use the
new configure flag.
Change-Id: I8774734771c66b22164b5fae8fdb27814ac3df7b
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 2e54a2d3ca..75e99fe223 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -457,7 +457,7 @@ #include <qelapsedtimer.h> #include <qscopedvaluerollback.h> -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL #include <QtNetwork/qsslsocket.h> #endif @@ -2244,7 +2244,7 @@ void QAbstractSocket::abort() #endif if (d->state == UnconnectedState) return; -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL if (QSslSocket *socket = qobject_cast<QSslSocket *>(this)) { socket->abort(); return; @@ -2303,7 +2303,7 @@ bool QAbstractSocket::atEnd() const bool QAbstractSocket::flush() { Q_D(QAbstractSocket); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL // Manual polymorphism; flush() isn't virtual, but QSslSocket overloads // it. if (QSslSocket *socket = qobject_cast<QSslSocket *>(this)) |