diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:57:12 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:58:13 +0100 |
| commit | c4ad58ed2252d5ed9f448a5c068ab33dce4cadd9 (patch) | |
| tree | 7e9802171d7b4c641c2de1ef781023cab5d7d14c /src/network/access/qnetworkrequest.cpp | |
| parent | 7da3a61b5fd5cc726f8fd62691aa5f84c7929800 (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
| download | qtbase-c4ad58ed2252d5ed9f448a5c068ab33dce4cadd9.tar.gz | |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c
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. |