diff --git a/apps/LocalStreamer/Application.cpp b/apps/LocalStreamer/Application.cpp index 36e956ba..ef5f046f 100644 --- a/apps/LocalStreamer/Application.cpp +++ b/apps/LocalStreamer/Application.cpp @@ -45,6 +45,8 @@ #include "localstreamer/CommandLineOptions.h" #include +#include + #include #define TIDE_STREAM_HOST_ADDRESS "localhost" @@ -55,6 +57,13 @@ Application::Application(int &argc_, char **argv_) , _pixelStreamer(0) , _deflectStream(0) { + // Correctly setup the proxy from the 'http_proxy' environment variable + const QUrl url( qgetenv( "http_proxy" ).constData( )); + if( url.scheme() == "http" ) + { + QNetworkProxy proxy( QNetworkProxy::HttpProxy, url.host(), url.port( )); + QNetworkProxy::setApplicationProxy( proxy ); + } } Application::~Application() diff --git a/doc/Changelog.md b/doc/Changelog.md index 7fce038e..4bbbaa50 100644 --- a/doc/Changelog.md +++ b/doc/Changelog.md @@ -3,6 +3,8 @@ Changelog {#Changelog} # git master (1.1.0) +* [24](https://github.com/BlueBrain/Tide/pull/24): + Bugfix: Correctly setup Webbrowser proxy from 'http_proxy' ENV VAR * [23](https://github.com/BlueBrain/Tide/pull/23): Replaced the Dock with a new Qml Launcher and a side control panel to open it [DISCL-313] and [DISCL-316]. The Launcher improves the user experience and