diff options
author | Eike Ziller <eike.ziller@nokia.com> | 2011-12-08 11:48:58 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@nokia.com> | 2011-12-08 12:31:23 +0100 |
commit | 317ed0a7e6dd69136186897427b30f1fcdca7def (patch) | |
tree | e3b7f825a6ab683cb0a90683ffa77aee736fadc0 | |
parent | 9fb2a23a31182814a1c568fd0589de7093d65b92 (diff) | |
download | qt-creator-317ed0a7e6dd69136186897427b30f1fcdca7def.tar.gz |
Fix windows proxy setting again.
Broke with 4edec9f9.
Change-Id: I1dfad5964f7d36566de0874d19e7ca94e3b92054
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
(cherry picked from commit b2c73f6e18a18d143445a163b358d1700eef5d32)
-rw-r--r-- | src/app/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index d42dc045a9..ca82f957b5 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -282,11 +282,13 @@ int main(int argc, char **argv) proxyUrl.port(), proxyUrl.userName(), proxyUrl.password()); QNetworkProxy::setApplicationProxy(proxy); } -#if defined(Q_OS_MAC) +# if defined(Q_OS_MAC) // unix and mac else { QNetworkProxyFactory::setUseSystemConfiguration(true); } -#endif +# endif +#else // windows + QNetworkProxyFactory::setUseSystemConfiguration(true); #endif // Load const QStringList pluginPaths = getPluginPaths(); |