diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:59:32 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:59:32 +0100 |
| commit | fc9ee5223e2a533abc9e82dbf19253b788ac457b (patch) | |
| tree | c2d4f5acba2e97189672b2fc6aea6253c678dc7e /src/imports/controls/material/qquickmaterialstyle_p.h | |
| parent | f787a0353a347aa096d154b7d93c7890f0cd060a (diff) | |
| parent | f56ec245eab24d56800a24f5bc06de1de4f87293 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I4aae04ab8cac381b4a8262a2f47298ca014f4692
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle_p.h')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index 00103361..9f3dbbbd 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -95,6 +95,7 @@ class QQuickMaterialStyle : public QQuickStyle Q_PROPERTY(QColor drawerBackgroundColor READ drawerBackgroundColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor dialogColor READ dialogColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor backgroundDimColor READ backgroundDimColor NOTIFY paletteChanged FINAL) + Q_PROPERTY(QColor listHighlightColor READ listHighlightColor NOTIFY paletteChanged FINAL) public: enum Theme { @@ -201,6 +202,7 @@ public: QColor drawerBackgroundColor() const; QColor dialogColor() const; QColor backgroundDimColor() const; + QColor listHighlightColor() const; Q_INVOKABLE QColor color(Color color, Shade shade = Shade500) const; Q_INVOKABLE QColor shade(const QColor &color, Shade shade) const; |