Merge remote branch 'origin/2.1'

2011-01-24 14:01:04 +01:00
parent 636f262fcc a5b5e06f19
commit 34f28a87ab
8 changed files with 133 additions and 129 deletions
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -254,7 +254,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);
    }