diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-27 22:04:58 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-27 22:13:52 +0200 |
| commit | 8c47e08dfba62385f7255b88be0587485c6d2696 (patch) | |
| tree | 01e61e004cdd88bd332e6368e0d82a72d1bd97ca /src/imports/controls/material/qquickmaterialstyle.cpp | |
| parent | 150d8fcc7f97e4a5d56bdcf608fa22533d807677 (diff) | |
| parent | 891afc345ba854414f5084b1b08eccb66eeaf54a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ifb2d12d09994f3970b117ee76522c7d9c7152587
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle.cpp')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 55bc5066..49cbd5ed 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -542,6 +542,7 @@ void QQuickMaterialStyle::inheritPrimary(uint primary, bool custom) m_primary = primary; propagatePrimary(); emit primaryChanged(); + emit paletteChanged(); } void QQuickMaterialStyle::propagatePrimary() @@ -597,6 +598,7 @@ void QQuickMaterialStyle::inheritAccent(uint accent, bool custom) m_accent = accent; propagateAccent(); emit accentChanged(); + emit paletteChanged(); } void QQuickMaterialStyle::propagateAccent() |