feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix windows proxy setting again.

Browse Source 
Broke with 4edec9f9.

Change-Id: I1dfad5964f7d36566de0874d19e7ca94e3b92054
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Eike Ziller
2011-12-08 11:48:58 +01:00
parent 3807b0fae5
commit b2c73f6e18
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/main.cpp
View File

@@ -284,11 +284,13 @@ int main(int argc, char **argv)
proxyUrl.port(), proxyUrl.userName(), proxyUrl.password()); proxyUrl.port(), proxyUrl.userName(), proxyUrl.password());
QNetworkProxy::setApplicationProxy(proxy); QNetworkProxy::setApplicationProxy(proxy);
} }
#if defined(Q_OS_MAC) # if defined(Q_OS_MAC) // unix and mac
else { else {
QNetworkProxyFactory::setUseSystemConfiguration(true); QNetworkProxyFactory::setUseSystemConfiguration(true);
} }
#endif # endif
#else // windows
QNetworkProxyFactory::setUseSystemConfiguration(true);
#endif #endif
// Load // Load
const QStringList pluginPaths = getPluginPaths(); const QStringList pluginPaths = getPluginPaths();