From 4edec9f92ad0cf2d00a374a1edcfc2bd543d5952 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 30 Mar 2011 14:58:05 +0200
Subject: [PATCH] Workaround for Mac users with automatic proxy configuration
Qt's implementation for the Mac system configuration doesn't handle
automatic proxy configurations. Qt Creator now also looks at the
http_proxy environment variable on Mac as a workaround.
Task-number: QTCREATORBUG-4190
Reviewed-by: Daniel Molkentin
---
src/app/main.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 471dd7bba81..52a769cfe03 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -251,15 +251,18 @@ int main(int argc, char **argv)
}
// Make sure we honor the system's proxy settings
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX)
QUrl proxyUrl(QString::fromLatin1(qgetenv("http_proxy")));
if (proxyUrl.isValid()) {
QNetworkProxy proxy(QNetworkProxy::HttpProxy, proxyUrl.host(),
proxyUrl.port(), proxyUrl.userName(), proxyUrl.password());
QNetworkProxy::setApplicationProxy(proxy);
}
-#else
- QNetworkProxyFactory::setUseSystemConfiguration(true);
+#if defined(Q_OS_MAC)
+ else {
+ QNetworkProxyFactory::setUseSystemConfiguration(true);
+ }
+#endif
#endif
// Load
const QStringList pluginPaths = getPluginPaths();
--
GitLab