From b1f45d75fdf0751a5c7b1912c7157defa9ed69ba Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 21 Dec 2021 08:08:45 +0100 Subject: [PATCH] improve app behavior when compiled statically --- pri/build_opts.pri | 4 ++++ resources/desktop/com.github.rssguard.appdata.xml | 2 +- src/rssguard/main.cpp | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pri/build_opts.pri b/pri/build_opts.pri index 2a36951cc..6bf2b16ce 100644 --- a/pri/build_opts.pri +++ b/pri/build_opts.pri @@ -82,6 +82,10 @@ win32 { # Additionally link against Shell32. LIBS *= Shell32.lib + + static { + LIBS *= -lodbc32 + } } static { diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 76c5137a0..4ea14d24b 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -26,7 +26,7 @@ https://github.com/sponsors/martinrotter - + none diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp index 31be1e13c..4b8fd58a7 100644 --- a/src/rssguard/main.cpp +++ b/src/rssguard/main.cpp @@ -30,6 +30,13 @@ int main(int argc, char* argv[]) { QApplication::setDesktopFileName(APP_DESKTOP_ENTRY_FILE); #endif +#if defined(QT_STATIC) + // NOTE: Add all used resources here. + Q_INIT_RESOURCE(icons); + Q_INIT_RESOURCE(sql); + Q_INIT_RESOURCE(rssguard); +#endif + // Ensure that ini format is used as application settings storage on macOS. QSettings::setDefaultFormat(QSettings::IniFormat);