diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 8b2569c365..7f4864f515 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp @@ -160,7 +160,7 @@ bool RbSettings::cacheDisabled() QString RbSettings::proxyType() { - return userSettings->value("proxytype", "system").toString(); + return userSettings->value("proxytype", "none").toString(); } QString RbSettings::proxy() diff --git a/rbutil/rbutilqt/utils.cpp b/rbutil/rbutilqt/utils.cpp index 529298530e..27314a8ef2 100644 --- a/rbutil/rbutilqt/utils.cpp +++ b/rbutil/rbutilqt/utils.cpp @@ -57,8 +57,7 @@ QUrl systemProxy(void) { #if defined(Q_OS_LINUX) return QUrl(getenv("http_proxy")); -#endif -#if defined(Q_OS_WIN32) +#elseif defined(Q_OS_WIN32) HKEY hk; wchar_t proxyval[80]; DWORD buflen = 80; @@ -84,5 +83,7 @@ QUrl systemProxy(void) return QUrl("http://" + QString::fromWCharArray(proxyval)); else return QUrl(""); +#else + return QUrl(""); #endif }