diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:32 +0100 |
| commit | 3afec43b69991753416380d88e22b5382b8b0832 (patch) | |
| tree | 15f14aa78ba2a9cc8c118665318e9e5b77282d8b /src/imports/controls/fusion/qquickfusiontheme.cpp | |
| parent | 1a89fbc5a8e9fe6b2711c2e87e9909201c26d499 (diff) | |
| parent | 09181d8b61cf3c84c88258586d68bd721d440620 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: I13c6458d7a7f92daf58c12e4c120d99a1f56cbfa
Diffstat (limited to 'src/imports/controls/fusion/qquickfusiontheme.cpp')
| -rw-r--r-- | src/imports/controls/fusion/qquickfusiontheme.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/imports/controls/fusion/qquickfusiontheme.cpp b/src/imports/controls/fusion/qquickfusiontheme.cpp index ac88563a..107619bf 100644 --- a/src/imports/controls/fusion/qquickfusiontheme.cpp +++ b/src/imports/controls/fusion/qquickfusiontheme.cpp @@ -37,12 +37,16 @@ #include "qquickfusiontheme_p.h" #include <QtQuickTemplates2/private/qquicktheme_p.h> +#include <QtQuickControls2/private/qquickstyle_p.h> QT_BEGIN_NAMESPACE void QQuickFusionTheme::initialize(QQuickTheme *theme) { - Q_UNUSED(theme); + const bool isDarkSystemTheme = QQuickStylePrivate::isDarkSystemTheme(); + QPalette systemPalette; + systemPalette.setColor(QPalette::ButtonText, isDarkSystemTheme ? Qt::white : Qt::black); + theme->setPalette(QQuickTheme::System, systemPalette); } QT_END_NAMESPACE |