diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-20 21:42:36 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-21 13:00:23 +0200 |
| commit | 63ed8bf07e11a7be236494608e91150e7f084028 (patch) | |
| tree | 9558e6fd1ff03083310ece71f391edeb6f799af1 /src/network | |
| parent | ca86d1e8c3c820937f5aa165cd1f761884da6e0b (diff) | |
Fix QtNetwork compilation for -qconfig large
Disables two variables completely in QNetworkProxy
Change-Id: I76483310b37032c44a25e05fb879de1e9d5282f5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 50bf670e7e..7a10ecf7ed 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -246,8 +246,12 @@ public: : mutex(QMutex::Recursive) , applicationLevelProxy(0) , applicationLevelProxyFactory(0) +#ifndef QT_NO_SOCKS5 , socks5SocketEngineHandler(0) +#endif +#ifndef QT_NO_HTTP , httpSocketEngineHandler(0) +#endif { #ifndef QT_NO_SOCKS5 socks5SocketEngineHandler = new QSocks5SocketEngineHandler(); @@ -261,8 +265,12 @@ public: { delete applicationLevelProxy; delete applicationLevelProxyFactory; +#ifndef QT_NO_SOCKS5 delete socks5SocketEngineHandler; +#endif +#ifndef QT_NO_HTTP delete httpSocketEngineHandler; +#endif } void setApplicationProxy(const QNetworkProxy &proxy) @@ -297,8 +305,12 @@ private: QMutex mutex; QNetworkProxy *applicationLevelProxy; QNetworkProxyFactory *applicationLevelProxyFactory; +#ifndef QT_NO_SOCKS5 QSocks5SocketEngineHandler *socks5SocketEngineHandler; +#endif +#ifndef QT_NO_HTTP QHttpSocketEngineHandler *httpSocketEngineHandler; +#endif }; QList<QNetworkProxy> QGlobalNetworkProxy::proxyForQuery(const QNetworkProxyQuery &query) |