From b21b8cf93691f7eab186a66ee7607886f4cc0484 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 24 Jan 2017 07:21:35 +0100
Subject: [PATCH] Prepare for msvc2015-qt5.8.

---
 .appveyor.yml         |  9 ++++-----
 resources/binaries    |  2 +-
 rssguard.pro          | 20 ++++++++++----------
 src/gui/webviewer.cpp |  1 -
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index d94961a2c..590b29931 100755
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,6 +1,6 @@
 version: 666.{build}
 skip_tags: true
-image: Visual Studio 2013
+os: Visual Studio 2015
 clone_depth: 1
 clone_folder: C:\rssguard
 
@@ -10,14 +10,13 @@ branches:
     - dev
 
 environment:
-  QTDIR: 'C:\Qt\5.7\msvc2013'
-  QMAKESPEC: win32-msvc2013
-  COMPILERBAT: '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86'
+  QTDIR: 'C:\Qt\5.8\msvc2015'
+  QMAKESPEC: win32-msvc2015
+  COMPILERBAT: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86'
   access_token:
     secure: XCWdr9wPgK4gm6289WXCg2vtMA02eBSnj6eKHC+ps6Z5lgw0jsK09UQ5y9E9ZFwS
   matrix:
     - qmake_args: 'USE_WEBENGINE=false'
-    
     - qmake_args: 'USE_WEBENGINE=true'
    
 build_script:
diff --git a/resources/binaries b/resources/binaries
index 64f9c9974..6560a9315 160000
--- a/resources/binaries
+++ b/resources/binaries
@@ -1 +1 @@
-Subproject commit 64f9c9974f4abd13c39345388c6dd5903bdac7ec
+Subproject commit 6560a93150c27abb47f0888320eb9b8e1ceff6a0
diff --git a/rssguard.pro b/rssguard.pro
index 26dd7d459..493b6fd7e 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -614,25 +614,25 @@ win32 {
   misc_sql.files = resources/misc/*.sql
   misc_sql.path = $$PREFIX/misc
 
-  qt_dlls_root.files = resources/binaries/windows/qt5-msvc2013/*.*
+  qt_dlls_root.files = resources/binaries/windows/qt5-msvc2015/*.*
   qt_dlls_root.path = $$quote($$PREFIX/)
 
-  qt_dlls_bearer.files = resources/binaries/windows/qt5-msvc2013/bearer
+  qt_dlls_bearer.files = resources/binaries/windows/qt5-msvc2015/bearer
   qt_dlls_bearer.path = $$quote($$PREFIX/)
 
-  qt_dlls_iconengines.files = resources/binaries/windows/qt5-msvc2013/iconengines
+  qt_dlls_iconengines.files = resources/binaries/windows/qt5-msvc2015/iconengines
   qt_dlls_iconengines.path = $$quote($$PREFIX/)
 
-  qt_dlls_imageformats.files = resources/binaries/windows/qt5-msvc2013/imageformats
+  qt_dlls_imageformats.files = resources/binaries/windows/qt5-msvc2015/imageformats
   qt_dlls_imageformats.path = $$quote($$PREFIX/)
 
-  qt_dlls_position.files = resources/binaries/windows/qt5-msvc2013/position
+  qt_dlls_position.files = resources/binaries/windows/qt5-msvc2015/position
   qt_dlls_position.path = $$quote($$PREFIX/)
 
-  qt_dlls_platforms.files = resources/binaries/windows/qt5-msvc2013/platforms/
+  qt_dlls_platforms.files = resources/binaries/windows/qt5-msvc2015/platforms/
   qt_dlls_platforms.path = $$quote($$PREFIX/)
 
-  qt_dlls_sqldrivers.files = resources/binaries/windows/qt5-msvc2013/sqldrivers
+  qt_dlls_sqldrivers.files = resources/binaries/windows/qt5-msvc2015/sqldrivers
   qt_dlls_sqldrivers.path = $$quote($$PREFIX/)
 
   misc_icons.files = resources/graphics/misc
@@ -672,13 +672,13 @@ win32 {
 
   equals(USE_WEBENGINE, true) {
     # Copy extra resource files for QtWebEngine.
-    qtwebengine_translations.files = resources/binaries/windows/qt5-msvc2013/QtWebEngine/translations
+    qtwebengine_translations.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/translations
     qtwebengine_translations.path = $$quote($$PREFIX/)
 
-    qtwebengine_resources.files = resources/binaries/windows/qt5-msvc2013/QtWebEngine/resources
+    qtwebengine_resources.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/resources
     qtwebengine_resources.path = $$quote($$PREFIX/)
 
-    qtwebengine_dlls.files = resources/binaries/windows/qt5-msvc2013/QtWebEngine/*.*
+    qtwebengine_dlls.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/*.*
     qtwebengine_dlls.path = $$quote($$PREFIX/)
 
     INSTALLS += qtwebengine_translations qtwebengine_resources qtwebengine_dlls
diff --git a/src/gui/webviewer.cpp b/src/gui/webviewer.cpp
index 378793932..cbada13a7 100755
--- a/src/gui/webviewer.cpp
+++ b/src/gui/webviewer.cpp
@@ -44,7 +44,6 @@ bool WebViewer::canDecreaseZoom() {
 }
 
 void WebViewer::displayMessage() {
-  //load(QUrl(INTERNAL_URL_MESSAGE));
   setHtml(m_messageContents, QUrl::fromUserInput(INTERNAL_URL_MESSAGE));
 }