Skip to content

Fixing the proxy type error #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ppodhajski merged 1 commit into from
Jun 23, 2017
Merged

Fixing the proxy type error #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Daniel Nachbaur <daniel.nachbaur@epfl.ch>

cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
project(Deflect VERSION 0.13.0)
project(Deflect VERSION 0.13.1)
set(Deflect_VERSION_ABI 6)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/common)
Expand Down
6 changes: 5 additions & 1 deletion deflect/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include "NetworkProtocol.h"
#include "ServerWorker.h"

#include <QNetworkProxy>
#include <QThread>
#include <stdexcept>

Expand All @@ -60,9 +61,12 @@ class Server::Impl
Server::Server(const int port)
: _impl(new Impl)
{
setProxy(QNetworkProxy::NoProxy);
if (!listen(QHostAddress::Any, port))
{
const auto err = QString("could not listen on port: %1").arg(port);
const auto err = QString("could not listen on port: %1. QTcpServer: %2")
.arg(port)
.arg(QTcpServer::errorString());
throw std::runtime_error(err.toStdString());
}

Expand Down
5 changes: 5 additions & 0 deletions doc/Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ Changelog {#Changelog}

## Deflect 0.13

### 0.13.1 (git master)

* [173](https://github.com/BlueBrain/Deflect/pull/173):
Fix server: disabling system proxy which are default starting Qt 5.8

### Deflect 0.13.0 (10-05-2017)
* [163](https://github.com/BlueBrain/Deflect/pull/163):
Stereo streaming accepts side-by-side images as input.
Expand Down