Commit b2c73f6e authored by Eike Ziller's avatar Eike Ziller
Browse files

Fix windows proxy setting again.

Broke with 4edec9f9

.

Change-Id: I1dfad5964f7d36566de0874d19e7ca94e3b92054
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 3807b0fa
......@@ -284,11 +284,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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment