pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prepare for msvc2015-qt5.8.

Browse source
This commit is contained in:
Martin Rotter 2017-01-24 07:21:35 +01:00
parent 1db5e61c8b
commit b21b8cf936
4 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.appveyor.yml
View file

@ -1,6 +1,6 @@
version: 666.{build} version: 666.{build}
skip_tags: true skip_tags: true
image: Visual Studio 2013 os: Visual Studio 2015
clone_depth: 1 clone_depth: 1
clone_folder: C:\rssguard clone_folder: C:\rssguard
@ -10,14 +10,13 @@ branches:
- dev - dev
environment: environment:
QTDIR: 'C:\Qt\5.7\msvc2013' QTDIR: 'C:\Qt\5.8\msvc2015'
QMAKESPEC: win32-msvc2013 QMAKESPEC: win32-msvc2015
COMPILERBAT: '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86' COMPILERBAT: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86'
access_token: access_token:
secure: XCWdr9wPgK4gm6289WXCg2vtMA02eBSnj6eKHC+ps6Z5lgw0jsK09UQ5y9E9ZFwS secure: XCWdr9wPgK4gm6289WXCg2vtMA02eBSnj6eKHC+ps6Z5lgw0jsK09UQ5y9E9ZFwS
matrix: matrix:
- qmake_args: 'USE_WEBENGINE=false' - qmake_args: 'USE_WEBENGINE=false'
- qmake_args: 'USE_WEBENGINE=true' - qmake_args: 'USE_WEBENGINE=true'
build_script: build_script:

2
resources/binaries

@ -1 +1 @@
Subproject commit 64f9c9974f4abd13c39345388c6dd5903bdac7ec Subproject commit 6560a93150c27abb47f0888320eb9b8e1ceff6a0

20
rssguard.pro
View file

@ -614,25 +614,25 @@ win32 {
misc_sql.files = resources/misc/*.sql misc_sql.files = resources/misc/*.sql
misc_sql.path = $$PREFIX/misc 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_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_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_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_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_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_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/) qt_dlls_sqldrivers.path = $$quote($$PREFIX/)
misc_icons.files = resources/graphics/misc misc_icons.files = resources/graphics/misc
@ -672,13 +672,13 @@ win32 {
equals(USE_WEBENGINE, true) { equals(USE_WEBENGINE, true) {
# Copy extra resource files for QtWebEngine. # 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_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_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/) qtwebengine_dlls.path = $$quote($$PREFIX/)
INSTALLS += qtwebengine_translations qtwebengine_resources qtwebengine_dlls INSTALLS += qtwebengine_translations qtwebengine_resources qtwebengine_dlls

1
src/gui/webviewer.cpp
View file

@ -44,7 +44,6 @@ bool WebViewer::canDecreaseZoom() {
} }
void WebViewer::displayMessage() { void WebViewer::displayMessage() {
//load(QUrl(INTERNAL_URL_MESSAGE));
setHtml(m_messageContents, QUrl::fromUserInput(INTERNAL_URL_MESSAGE)); setHtml(m_messageContents, QUrl::fromUserInput(INTERNAL_URL_MESSAGE));
} }