summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Weber <niels.2.weber@nokia.com>2011-11-28 14:38:04 +0100
committerKarsten Heimrich <karsten.heimrich@nokia.com>2011-11-28 14:48:30 +0100
commit03414189fdfb5b24d081c8bf0cb9fe5f5da731a3 (patch)
tree837c7698b838b1080996736fc576f7aee0428867
parentc4dc22c5fd76e8b028200d33553b97079adeaeb3 (diff)
compile fix for Linux
Change-Id: Id2a87d393f154870fb6d7dbba747be083706280a Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
-rw-r--r--installerbuilder/libinstaller/packagemanagerproxyfactory.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/installerbuilder/libinstaller/packagemanagerproxyfactory.cpp b/installerbuilder/libinstaller/packagemanagerproxyfactory.cpp
index 87caf2c50..ee3570856 100644
--- a/installerbuilder/libinstaller/packagemanagerproxyfactory.cpp
+++ b/installerbuilder/libinstaller/packagemanagerproxyfactory.cpp
@@ -49,6 +49,8 @@ PackageManagerProxyFactory *PackageManagerProxyFactory::clone() const
QList<QNetworkProxy> PackageManagerProxyFactory::queryProxy(const QNetworkProxyQuery &query)
{
const Settings &settings = m_core->settings();
+ QList<QNetworkProxy> list;
+
if (settings.proxyType() == Settings::SystemProxy) {
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
QUrl proxyUrl = QUrl::fromUserInput(QString::fromUtf8(qgetenv("http_proxy")));
@@ -60,7 +62,6 @@ QList<QNetworkProxy> PackageManagerProxyFactory::queryProxy(const QNetworkProxyQ
return QNetworkProxyFactory::systemProxyForQuery(query);
}
- QList<QNetworkProxy> list;
if ((settings.proxyType() == Settings::NoProxy))
return list << QNetworkProxy(QNetworkProxy::NoProxy);