AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QtNetwork compilation for -qconfig large

Browse Source 
Disables two variables completely in QNetworkProxy

Change-Id: I76483310b37032c44a25e05fb879de1e9d5282f5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
This commit is contained in:
Tasuku Suzuki 2012-05-20 21:42:36 +09:00 committed by Qt by Nokia
parent ca86d1e8c3
commit 63ed8bf07e
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/kernel/qnetworkproxy.cpp
View File

@ -246,8 +246,12 @@ public:
: mutex(QMutex::Recursive) : mutex(QMutex::Recursive)
, applicationLevelProxy(0) , applicationLevelProxy(0)
, applicationLevelProxyFactory(0) , applicationLevelProxyFactory(0)
#ifndef QT_NO_SOCKS5
, socks5SocketEngineHandler(0) , socks5SocketEngineHandler(0)
#endif
#ifndef QT_NO_HTTP
, httpSocketEngineHandler(0) , httpSocketEngineHandler(0)
#endif
{ {
#ifndef QT_NO_SOCKS5 #ifndef QT_NO_SOCKS5
socks5SocketEngineHandler = new QSocks5SocketEngineHandler(); socks5SocketEngineHandler = new QSocks5SocketEngineHandler();
@ -261,8 +265,12 @@ public:
{ {
delete applicationLevelProxy; delete applicationLevelProxy;
delete applicationLevelProxyFactory; delete applicationLevelProxyFactory;
#ifndef QT_NO_SOCKS5
delete socks5SocketEngineHandler; delete socks5SocketEngineHandler;
#endif
#ifndef QT_NO_HTTP
delete httpSocketEngineHandler; delete httpSocketEngineHandler;
#endif
} }
void setApplicationProxy(const QNetworkProxy &proxy) void setApplicationProxy(const QNetworkProxy &proxy)
@ -297,8 +305,12 @@ private:
QMutex mutex; QMutex mutex;
QNetworkProxy *applicationLevelProxy; QNetworkProxy *applicationLevelProxy;
QNetworkProxyFactory *applicationLevelProxyFactory; QNetworkProxyFactory *applicationLevelProxyFactory;
#ifndef QT_NO_SOCKS5
QSocks5SocketEngineHandler *socks5SocketEngineHandler; QSocks5SocketEngineHandler *socks5SocketEngineHandler;
#endif
#ifndef QT_NO_HTTP
QHttpSocketEngineHandler *httpSocketEngineHandler; QHttpSocketEngineHandler *httpSocketEngineHandler;
#endif
}; };
QList<QNetworkProxy> QGlobalNetworkProxy::proxyForQuery(const QNetworkProxyQuery &query) QList<QNetworkProxy> QGlobalNetworkProxy::proxyForQuery(const QNetworkProxyQuery &query)