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/access/qnetworkrequest.cpp | |
| 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/access/qnetworkrequest.cpp')
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index ef81b6081d..f94337eaeb 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -289,13 +289,13 @@ class QNetworkRequestPrivate: public QSharedData, public QNetworkHeadersPrivate public: inline QNetworkRequestPrivate() : priority(QNetworkRequest::NormalPriority) -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL , sslConfiguration(0) #endif { qRegisterMetaType<QNetworkRequest>(); } ~QNetworkRequestPrivate() { -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL delete sslConfiguration; #endif } @@ -307,7 +307,7 @@ public: url = other.url; priority = other.priority; -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL sslConfiguration = 0; if (other.sslConfiguration) sslConfiguration = new QSslConfiguration(*other.sslConfiguration); @@ -325,7 +325,7 @@ public: QUrl url; QNetworkRequest::Priority priority; -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL mutable QSslConfiguration *sslConfiguration; #endif }; @@ -526,7 +526,7 @@ void QNetworkRequest::setAttribute(Attribute code, const QVariant &value) d->attributes.remove(code); } -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL /*! Returns this network request's SSL configuration. By default, no SSL settings are specified. |