From 676cba90c2606a65155fedff37b26af71234ae7b Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 6 Jun 2016 07:28:32 +0200 Subject: [PATCH] Added support for make install with WebEngine. --- resources/binaries | 2 +- rssguard.pro | 34 ++++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/resources/binaries b/resources/binaries index 2392b936c..432259dea 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit 2392b936c08eac92a6a34361a916a739f53836d0 +Subproject commit 432259dea8128382b648e99ec89f7d6919f42a84 diff --git a/rssguard.pro b/rssguard.pro index d86fb2eff..7942f3cc6 100644 --- a/rssguard.pro +++ b/rssguard.pro @@ -486,20 +486,29 @@ win32 { qt_dlls_root.files = resources/binaries/windows/qt5-msvc2013/*.dll qt_dlls_root.path = $$quote($$PREFIX/) - qt_dlls_bearer.files = resources/binaries/windows/qt5-msvc2013/bearer/*.dll - qt_dlls_bearer.path = $$quote($$PREFIX/bearer/) + qt_exe_root.files = resources/binaries/windows/qt5-msvc2013/*.exe + qt_exe_root.path = $$quote($$PREFIX/) - qt_dlls_iconengines.files = resources/binaries/windows/qt5-msvc2013/iconengines/*.dll - qt_dlls_iconengines.path = $$quote($$PREFIX/iconengines/) + qt_dlls_bearer.files = resources/binaries/windows/qt5-msvc2013/bearer + qt_dlls_bearer.path = $$quote($$PREFIX/) - qt_dlls_imageformats.files = resources/binaries/windows/qt5-msvc2013/imageformats/*.dll - qt_dlls_imageformats.path = $$quote($$PREFIX/imageformats/) + qt_dlls_iconengines.files = resources/binaries/windows/qt5-msvc2013/iconengines + qt_dlls_iconengines.path = $$quote($$PREFIX/) - qt_dlls_platforms.files = resources/binaries/windows/qt5-msvc2013/platforms/*.dll - qt_dlls_platforms.path = $$quote($$PREFIX/platforms/) + qt_dlls_imageformats.files = resources/binaries/windows/qt5-msvc2013/imageformats + qt_dlls_imageformats.path = $$quote($$PREFIX/) - qt_dlls_sqldrivers.files = resources/binaries/windows/qt5-msvc2013/sqldrivers/*.dll - qt_dlls_sqldrivers.path = $$quote($$PREFIX/sqldrivers/) + qt_dlls_platforms.files = resources/binaries/windows/qt5-msvc2013/platforms/ + qt_dlls_platforms.path = $$quote($$PREFIX/) + + qt_dlls_sqldrivers.files = resources/binaries/windows/qt5-msvc2013/sqldrivers + qt_dlls_sqldrivers.path = $$quote($$PREFIX/) + + qt_dlls_translations.files = resources/binaries/windows/qt5-msvc2013/translations + qt_dlls_translations.path = $$quote($$PREFIX/) + + qt_dlls_resources.files = resources/binaries/windows/qt5-msvc2013/resources + qt_dlls_resources.path = $$quote($$PREFIX/) misc_icons.files = resources/graphics/misc misc_icons.path = $$quote($$PREFIX/icons/) @@ -531,9 +540,10 @@ win32 { translations.files = $$OUT_PWD/l10n translations.path = $$quote($$PREFIX/) - INSTALLS += target misc_sql qt_dlls_root qt_dlls_bearer qt_dlls_iconengines \ + INSTALLS += target misc_sql qt_dlls_root qt_exe_root qt_dlls_bearer qt_dlls_iconengines \ qt_dlls_imageformats qt_dlls_platforms qt_dlls_sqldrivers \ - misc_icons faenza skins sql feeds texts ico app_icon app_plain_icon translations + qt_dlls_translations qt_dlls_resources misc_icons faenza skins \ + sql feeds texts ico app_icon app_plain_icon translations } # Install all files on Linux.