diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2018-02-21 16:00:57 +0300 |
---|---|---|
committer | Camila San <hello@camila.codes> | 2018-05-31 22:56:55 +0300 |
commit | 204cb470b4004d19aaf042b61bcdaf3e46b638ba (patch) | |
tree | 92a6c37860df54109d6ead985c3f12c099e9ed6d /src/cmd | |
parent | 9fe8713bdc34569a977c6f818d9ea2292eacb19f (diff) |
owncloudcmd: Do not read the proxy settings from the gui's config file
The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
Diffstat (limited to 'src/cmd')
-rw-r--r-- | src/cmd/cmd.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp index 2abed85d2..3d7560f54 100644 --- a/src/cmd/cmd.cpp +++ b/src/cmd/cmd.cpp @@ -23,10 +23,10 @@ #include <QFileInfo> #include <QJsonDocument> #include <QJsonObject> +#include <QNetworkProxy> #include <qdebug.h> #include "account.h" -#include "clientproxy.h" #include "configfile.h" // ONLY ACCESS THE STATIC FUNCTIONS! #include "creds/httpcredentials.h" #include "simplesslerrorhandler.h" @@ -327,7 +327,6 @@ int main(int argc, char **argv) options.restartTimes = 3; options.uplimit = 0; options.downlimit = 0; - ClientProxy clientProxy; parseOptions(app.arguments(), &options); @@ -439,8 +438,6 @@ int main(int argc, char **argv) } else { qFatal("Could not read httpproxy. The proxy should have the format \"http://hostname:port\"."); } - } else { - clientProxy.setupQtProxyFromConfig(); } SimpleSslErrorHandler *sslErrorHandler = new SimpleSslErrorHandler; |