forked from qt-creator/qt-creator
Fix windows proxy setting again.
Broke with 4edec9f9.
Change-Id: I1dfad5964f7d36566de0874d19e7ca94e3b92054
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user