diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-30 15:41:38 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-30 13:55:45 +0000 |
commit | 38e876032834ab6d02b94a798fe2866a79757719 (patch) | |
tree | 0905d2f5a020a8544d2af8d8ff3cdac54e1c89cd /src | |
parent | 7a418e470b1fa91d73d7ee8d299bd4a95b40eab9 (diff) |
Material: fix accent update on theme change
Change-Id: I9cb3fd6bdbedc0e7ca472b815502bce48dca00b7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index ae8c3a11..0ff49732 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -479,6 +479,8 @@ void QQuickMaterialStyle::setTheme(Theme theme) propagateTheme(); emit themeChanged(); emit paletteChanged(); + if (!m_customAccent) + emit accentChanged(); if (!m_hasBackground) emit backgroundChanged(); if (!m_hasForeground) @@ -494,6 +496,8 @@ void QQuickMaterialStyle::inheritTheme(Theme theme) propagateTheme(); emit themeChanged(); emit paletteChanged(); + if (!m_customAccent) + emit accentChanged(); if (!m_hasBackground) emit backgroundChanged(); if (!m_hasForeground) |