diff options
| author | Nikita Krupenko <krnekit@gmail.com> | 2016-05-05 22:50:04 +0300 |
|---|---|---|
| committer | Nikita Krupenko <krnekit@gmail.com> | 2016-05-09 13:52:56 +0000 |
| commit | 4cf39df949c3a1e136ac8832be9d4608733e45f2 (patch) | |
| tree | 36bf78818d7d1d99d45c153746be8d3d6c525c8f /src/imports/controls/material/qquickmaterialstyle_p.h | |
| parent | 4dc0c0d4fa4e886650fb72161448bfb1f621b53b (diff) | |
Material: fix flat button colors
As 251afe3eaac3367c5c659dddc1e8854f833d5112 changed the way, how button
color are retrieved, use it for flat buttons too.
Change-Id: I28448c597b027293b1acac22dad586e0e7156707
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle_p.h')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index fb73b7d7..e7434d83 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -83,7 +83,6 @@ class QQuickMaterialStyle : public QQuickStyleAttached Q_PROPERTY(QColor highlightedButtonColor READ highlightedButtonColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor highlightedButtonHoverColor READ highlightedButtonHoverColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor highlightedButtonPressColor READ highlightedButtonPressColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor flatButtonFocusColor READ flatButtonFocusColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor swipeDelegateColor READ swipeDelegateColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor swipeDelegateHoverColor READ swipeDelegateHoverColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor swipeDelegatePressColor READ swipeDelegatePressColor NOTIFY paletteChanged FINAL) @@ -211,7 +210,6 @@ public: QColor highlightedButtonHoverColor() const; QColor highlightedButtonPressColor() const; QColor highlightedButtonDisabledColor() const; - QColor flatButtonFocusColor() const; QColor swipeDelegateColor() const; QColor swipeDelegateHoverColor() const; QColor swipeDelegatePressColor() const; |