diff --git a/src/app/main.cpp b/src/app/main.cpp index da67b6f04ac..301ec9a878d 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -393,20 +393,8 @@ int main(int argc, char **argv) } // Make sure we honor the system's proxy settings -#if defined(Q_OS_UNIX) - QUrl proxyUrl(QString::fromLatin1(qgetenv("http_proxy"))); - if (proxyUrl.isValid()) { - QNetworkProxy proxy(QNetworkProxy::HttpProxy, proxyUrl.host(), - proxyUrl.port(), proxyUrl.userName(), proxyUrl.password()); - QNetworkProxy::setApplicationProxy(proxy); -# if defined(Q_OS_MAC) // unix and mac - } else { - QNetworkProxyFactory::setUseSystemConfiguration(true); -# endif - } -#else // windows QNetworkProxyFactory::setUseSystemConfiguration(true); -#endif + // Load const QStringList pluginPaths = getPluginPaths() + customPluginPaths; PluginManager::setPluginPaths(pluginPaths);