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/qhttpnetworkconnectionchannel_p.h | |
| parent | 7da3a61b5fd5cc726f8fd62691aa5f84c7929800 (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 1198ec9941..7da9b514d6 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -69,7 +69,7 @@ #ifndef QT_NO_HTTP -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL # include <QtNetwork/qsslsocket.h> # include <QtNetwork/qsslerror.h> #else @@ -115,7 +115,7 @@ public: QAuthenticator proxyAuthenticator; bool authenticationCredentialsSent; bool proxyCredentialsSent; -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL bool ignoreAllSslErrors; QList<QSslError> ignoreSslErrorsList; #endif @@ -177,7 +177,7 @@ public: void _q_uploadDataReadyRead(); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void _q_encrypted(); // start sending request (https) void _q_sslErrors(const QList<QSslError> &errors); // ssl errors from the socket void _q_encryptedBytesWritten(qint64 bytes); // proceed sending |