FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nowebengine build.

Browse Source
This commit is contained in:
Martin Rotter 2017-07-26 12:16:33 +02:00
parent 28fe0aee64
commit 83e5ffa15e
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/binaries

@ -1 +1 @@
Subproject commit e2fb756e2b3ac85b196129664e8a4d92581ac45a Subproject commit ebb0d0c1162630bf6daa1cf1583b348e84009d55

25
rssguard.pro
View File

@ -684,15 +684,15 @@ win32 {
win32 { win32 {
target.path = $$PREFIX target.path = $$PREFIX
misc_sql.files = resources/sql/*.sql
misc_sql.path = $$quote($$PREFIX/sql/)
qt_dlls_root.files = resources/binaries/windows/qt5-msvc2015/*.* qt_dlls_root.files = resources/binaries/windows/qt5-msvc2015/*.*
qt_dlls_root.path = $$quote($$PREFIX/) qt_dlls_root.path = $$quote($$PREFIX/)
qt_dlls_plugins.files = resources/binaries/windows/qt5-msvc2015/* qt_dlls_plugins.files = resources/binaries/windows/qt5-msvc2015/*
qt_dlls_plugins.path = $$quote($$PREFIX/) qt_dlls_plugins.path = $$quote($$PREFIX/)
misc_sql.files = resources/sql/*.sql
misc_sql.path = $$quote($$PREFIX/sql/)
misc_icons.files = resources/graphics/misc misc_icons.files = resources/graphics/misc
misc_icons.path = $$quote($$PREFIX/icons/) misc_icons.path = $$quote($$PREFIX/icons/)
@ -726,22 +726,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-msvc2015/QtWebEngine/translations qtwebengine_dlls.files = resources/binaries/windows/qt5-msvc2015-webengine/*
qtwebengine_translations.path = $$quote($$PREFIX/)
qtwebengine_resources.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/resources
qtwebengine_resources.path = $$quote($$PREFIX/)
qtwebengine_dlls_print.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/printsupport
qtwebengine_dlls_print.path = $$quote($$PREFIX/)
qtwebengine_position.files = resources/binaries/windows/qt5-msvc2015/QtWebEngine/position
qtwebengine_position.path = $$quote($$PREFIX/)
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_print qtwebengine_position qtwebengine_dlls qtwebengine.files = resources/binaries/windows/qt5-msvc2015-webengine/*.*
qtwebengine.path = $$quote($$PREFIX/)
INSTALLS += qtwebengine_dlls qtwebengine
} }
} }