diff options
| author | Frans Englich <frans.englich@nokia.com> | 2010-03-26 14:39:23 +0100 |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2010-03-26 14:40:32 +0100 |
| commit | fc6cbc103be7eb77d692fb2975397c656b6a939b (patch) | |
| tree | b0b7c40c5444a2d7272e4667999fbff12f96e303 /src/network/access/qhttpnetworkconnectionchannel_p.h | |
| parent | a8e00ddf3b78566f817ed270e6468421cf5d792b (diff) | |
| download | qt4-tools-fc6cbc103be7eb77d692fb2975397c656b6a939b.tar.gz | |
Fix compile error on Symbian 9.1, caused in network/access.
RVCT has trouble when QPointer is instantiated on classes with inlined
constructors/functions.
Compile fix for 43e1cffb16c2eea54392f5c56210b10abb2f044e,
cc22a14f3d2159a8f760b44e3fe1636a3721ce95 and 656c02f128c56177c48b3de47f7b1e17dbbfa4d3
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel_p.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 4a2f8adff1..51cb5e8a63 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -81,7 +81,6 @@ QT_BEGIN_NAMESPACE class QHttpNetworkRequest; class QHttpNetworkReply; class QByteArray; -class QHttpNetworkConnection; #ifndef HttpMessagePair typedef QPair<QHttpNetworkRequest, QHttpNetworkReply*> HttpMessagePair; @@ -128,17 +127,9 @@ public: QList<HttpMessagePair> alreadyPipelinedRequests; - QHttpNetworkConnectionChannel() : socket(0), state(IdleState), reply(0), written(0), bytesTotal(0), resendCurrent(false), - lastStatus(0), pendingEncrypt(false), reconnectAttempts(2), - authMehtod(QAuthenticatorPrivate::None), proxyAuthMehtod(QAuthenticatorPrivate::None) -#ifndef QT_NO_OPENSSL - , ignoreAllSslErrors(false) -#endif - , pipeliningSupported(PipeliningSupportUnknown) - , connection(0) - {} - - void setConnection(QHttpNetworkConnection *c) {connection = c;} + QHttpNetworkConnectionChannel(); + + void setConnection(QHttpNetworkConnection *c); QPointer<QHttpNetworkConnection> connection; void init(); @@ -188,8 +179,6 @@ public: #endif }; - - QT_END_NAMESPACE #endif // QT_NO_HTTP |