some warnings fixed, TDESKTOP_DISABLE_NETWORK_PROXY macro added

This commit is contained in:
John Preston
2016-03-20 11:16:35 +03:00
parent 2cbda4e1e5
commit 0b2bcbc3e9
25 changed files with 143 additions and 105 deletions
+2
View File
@@ -761,7 +761,9 @@ AppClass::AppClass() : QObject()
_window->showSettings();
}
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
QNetworkProxyFactory::setUseSystemConfiguration(true);
#endif
if (state != Local::ReadMapPassNeeded) {
checkMapVersion();