diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-09 21:27:45 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-09 22:37:18 +0100 |
| commit | 849b760c9047a9306d5a63d7fa60d0ab2431e1dd (patch) | |
| tree | 5753c9f690fdb826a89075ea02810929c04a047a /src/network/access/qhttpnetworkconnectionchannel_p.h | |
| parent | d4db23eb4d9113338ead0ed5f1c5b788681d8f43 (diff) | |
Revert "QNam: only init channels when needed."
This reverts commit ff25691d00d634068c6389f8f1607d7cc95ac5be.
The change broke qtdeclarative. Several autotests crash because
QHttpNetworkConnection::transparentProxy() calls proxy() on a
null socket.
Task-number: QTBUG-24717
Change-Id: I57e3ccf5d20683f59cf7450083d1fcb3fa1c40fe
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel_p.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 2648cba2a5..7da9b514d6 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -72,7 +72,6 @@ #ifndef QT_NO_SSL # include <QtNetwork/qsslsocket.h> # include <QtNetwork/qsslerror.h> -# include <QtNetwork/qsslconfiguration.h> #else # include <QtNetwork/qtcpsocket.h> #endif @@ -101,7 +100,6 @@ public: }; QAbstractSocket *socket; bool ssl; - bool isInitialized; ChannelState state; QHttpNetworkRequest request; // current request QHttpNetworkReply *reply; // current reply for this request @@ -120,10 +118,6 @@ public: #ifndef QT_NO_SSL bool ignoreAllSslErrors; QList<QSslError> ignoreSslErrorsList; - QSslConfiguration sslConfiguration; - void ignoreSslErrors(); - void ignoreSslErrors(const QList<QSslError> &errors); - void setSslConfiguration(const QSslConfiguration &config); #endif #ifndef QT_NO_BEARERMANAGEMENT QSharedPointer<QNetworkSession> networkSession; @@ -150,11 +144,6 @@ public: void setConnection(QHttpNetworkConnection *c); QPointer<QHttpNetworkConnection> connection; -#ifndef QT_NO_NETWORKPROXY - QNetworkProxy proxy; - void setProxy(const QNetworkProxy &networkProxy); -#endif - void init(); void close(); |