summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2011-01-20 12:03:17 +0100
committercon <qtc-committer@nokia.com>2011-01-20 13:29:36 +0100
commitfa58c6742eeb3f6867083a90a1116ca0a8f0a7e1 (patch)
tree3d5fed130bf9201516b74fe4f73ce13f36c5e730
parentee83c99c9b3e9907272cd4b9aff3beb559f34806 (diff)
downloadqt-creator-fa58c6742eeb3f6867083a90a1116ca0a8f0a7e1.tar.gz
Fix the manual proxy hack for Linux so it works with HTTPS
Reviewed-by: con
-rw-r--r--src/app/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 084d895356..134ff6949c 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -229,7 +229,7 @@ int main(int argc, char **argv)
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
QUrl proxyUrl(QString::fromLatin1(qgetenv("http_proxy")));
if (proxyUrl.isValid()) {
- QNetworkProxy proxy(QNetworkProxy::HttpCachingProxy, proxyUrl.host(),
+ QNetworkProxy proxy(QNetworkProxy::HttpProxy, proxyUrl.host(),
proxyUrl.port(), proxyUrl.userName(), proxyUrl.password());
QNetworkProxy::setApplicationProxy(proxy);
}