aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qquickmaterialstyle_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-18 20:38:43 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-18 21:24:49 +0000
commita075d91a0b0ce8dd82f55b0f0eacb45e17b2f134 (patch)
tree0c2e970d746e225cfef68c7fdc9581c954fd46f4 /src/imports/controls/material/qquickmaterialstyle_p.h
parent60c7f378577b0b6606000a95b1a609942904dddc (diff)
Material style for Menu
Change-Id: Ifb00d1ddfc326cf206f6d1ffd93ccbe248eb5a3d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle_p.h')
-rw-r--r--src/imports/controls/material/qquickmaterialstyle_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 9bfb8176..de751473 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -92,7 +92,7 @@ class QQuickMaterialStyle : public QQuickStyle
Q_PROPERTY(QColor scrollBarColor READ scrollBarColor NOTIFY paletteChanged FINAL)
Q_PROPERTY(QColor scrollBarPressedColor READ scrollBarPressedColor NOTIFY paletteChanged FINAL)
Q_PROPERTY(QColor drawerBackgroundColor READ drawerBackgroundColor NOTIFY paletteChanged FINAL)
- Q_PROPERTY(QColor comboBoxColor READ comboBoxColor NOTIFY paletteChanged FINAL)
+ Q_PROPERTY(QColor dialogColor READ dialogColor NOTIFY paletteChanged FINAL)
Q_PROPERTY(QColor backgroundDimColor READ backgroundDimColor NOTIFY paletteChanged FINAL)
public:
@@ -201,7 +201,7 @@ public:
QColor scrollBarColor() const;
QColor scrollBarPressedColor() const;
QColor drawerBackgroundColor() const;
- QColor comboBoxColor() const;
+ QColor dialogColor() const;
QColor backgroundDimColor() const;
Q_INVOKABLE QColor color(Color color, Shade shade) const;