From dbc2e9a4e256c1b1aeda872ecd9c4ad07780695c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 31 Mar 2024 13:49:34 +0200 Subject: [PATCH] Select correct icon theme for Qt Quick GUI depending on darkmode setting --- CMakeLists.txt | 2 +- quickgui/initiatequick.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74bc49b..60e8fd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,7 @@ include(BasicConfig) set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES "${CONFIGURATION_PACKAGE_SUFFIX}" CACHE STRING "sets the suffix for qtutilities") -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.12.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.14.0 REQUIRED) use_qt_utilities() # find passwordfile diff --git a/quickgui/initiatequick.cpp b/quickgui/initiatequick.cpp index 7367502..c334e02 100644 --- a/quickgui/initiatequick.cpp +++ b/quickgui/initiatequick.cpp @@ -10,6 +10,7 @@ // enable inline helper functions for Qt Quick provided by qtutilities #define QT_UTILITIES_GUI_QTQUICK +#include #include #include #include @@ -67,6 +68,9 @@ int runQuickGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs, c } qtSettings.restore(*settings); qtSettings.apply(); +#if defined(Q_OS_ANDROID) + qtSettings.reapplyDefaultIconTheme(QtUtilities::isDarkModeEnabled().value_or(false)); +#endif // apply settings specified via command line args qtConfigArgs.applySettings(qtSettings.hasCustomFont());