Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions apps/LocalStreamer/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
#include "localstreamer/CommandLineOptions.h"

#include <QTimer>
#include <QNetworkProxy>

#include <iostream>

#define TIDE_STREAM_HOST_ADDRESS "localhost"
Expand All @@ -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()
Expand Down
2 changes: 2 additions & 0 deletions doc/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down