From 539e371ec9a3e9953d1698879c4a4e3b08c587b2 Mon Sep 17 00:00:00 2001
From: Pawel Podhajski <pawel.podhajski@epfl.ch>
Date: Fri, 23 Jun 2017 12:42:11 +0200
Subject: [PATCH] Fixing the proxy type error caused by Qt 5.8 using system
 proxy settings

---
 CMakeLists.txt     | 2 +-
 deflect/Server.cpp | 6 +++++-
 doc/Changelog.md   | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f3acf8..ed78ecc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/deflect/Server.cpp b/deflect/Server.cpp
index d578f96..5684bbb 100644
--- a/deflect/Server.cpp
+++ b/deflect/Server.cpp
@@ -44,6 +44,7 @@
 #include "NetworkProtocol.h"
 #include "ServerWorker.h"
 
+#include <QNetworkProxy>
 #include <QThread>
 #include <stdexcept>
 
@@ -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());
     }
 
diff --git a/doc/Changelog.md b/doc/Changelog.md
index fca1595..6394c80 100644
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -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.