Martchus
/
passwordmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Select correct icon theme for Qt Quick GUI depending on darkmode setting

This commit is contained in:
Martchus 2024-03-31 13:49:34 +02:00
parent f960aa80a1
commit dbc2e9a4e2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -124,7 +124,7 @@ include(BasicConfig)
set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES
"${CONFIGURATION_PACKAGE_SUFFIX}" "${CONFIGURATION_PACKAGE_SUFFIX}"
CACHE STRING "sets the suffix for qtutilities") 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() use_qt_utilities()
# find passwordfile # find passwordfile

4
quickgui/initiatequick.cpp
View File

@ -10,6 +10,7 @@
// enable inline helper functions for Qt Quick provided by qtutilities // enable inline helper functions for Qt Quick provided by qtutilities
#define QT_UTILITIES_GUI_QTQUICK #define QT_UTILITIES_GUI_QTQUICK
#include <qtutilities/misc/desktoputils.h>
#include <qtutilities/resources/qtconfigarguments.h> #include <qtutilities/resources/qtconfigarguments.h>
#include <qtutilities/resources/resources.h> #include <qtutilities/resources/resources.h>
#include <qtutilities/settingsdialog/qtsettings.h> #include <qtutilities/settingsdialog/qtsettings.h>
@ -67,6 +68,9 @@ int runQuickGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs, c
} }
qtSettings.restore(*settings); qtSettings.restore(*settings);
qtSettings.apply(); qtSettings.apply();
#if defined(Q_OS_ANDROID)
qtSettings.reapplyDefaultIconTheme(QtUtilities::isDarkModeEnabled().value_or(false));
#endif
// apply settings specified via command line args // apply settings specified via command line args
qtConfigArgs.applySettings(qtSettings.hasCustomFont()); qtConfigArgs.applySettings(qtSettings.hasCustomFont());