diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-21 10:49:18 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-21 18:01:14 +0000 |
| commit | 20942576ff6a6faadf45d5045d80f4d21697c212 (patch) | |
| tree | 9b7fc9b4d440b8215d4c0e7c13aba3532579b8aa /src/imports/controls/material/qquickmaterialstyle_p.h | |
| parent | c11916721e7fd808014296c3fb344c602dccee53 (diff) | |
Material: rename ripple color properties
They are no longer specific to CheckBoxes, but used in most controls.
Change-Id: I404aeab706479d0b666529ebdb09caa6b8085cae
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle_p.h')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index 301748bb..d338e745 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -80,8 +80,8 @@ class QQuickMaterialStyle : public QQuickStyleAttached Q_PROPERTY(QColor buttonDisabledColor READ buttonDisabledColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor highlightedButtonColor READ highlightedButtonColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor frameColor READ frameColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor checkBoxUncheckedRippleColor READ checkBoxUncheckedRippleColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(QColor checkBoxCheckedRippleColor READ checkBoxCheckedRippleColor NOTIFY paletteChanged FINAL) + Q_PROPERTY(QColor rippleColor READ rippleColor NOTIFY paletteChanged FINAL) + Q_PROPERTY(QColor highlightedRippleColor READ highlightedRippleColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor switchUncheckedTrackColor READ switchUncheckedTrackColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor switchCheckedTrackColor READ switchCheckedTrackColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor switchUncheckedHandleColor READ switchUncheckedHandleColor NOTIFY paletteChanged FINAL) @@ -202,8 +202,8 @@ public: QColor highlightedButtonColor() const; QColor highlightedButtonDisabledColor() const; QColor frameColor() const; - QColor checkBoxUncheckedRippleColor() const; - QColor checkBoxCheckedRippleColor() const; + QColor rippleColor() const; + QColor highlightedRippleColor() const; QColor switchUncheckedTrackColor() const; QColor switchCheckedTrackColor() const; QColor switchUncheckedHandleColor() const; |