diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:18:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:19:21 +0200 |
| commit | 14e08bafc88824f3d16602b04b5e60ae8c4005b0 (patch) | |
| tree | 47a831782fe60e26e6bba7ff8e5a0c3ac0a81c42 /src/imports/controls/material/qquickmaterialstyle_p.h | |
| parent | 2ebb1fdcafaba9d3b0e7fbb42ccd5c3ffde38fbf (diff) | |
| parent | ceaf6177a8be6db22e629ff05a625e278025b071 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Comparing colors in tst_material.qml works fine now.
Conflicts:
examples/quickcontrols2/gallery/qtquickcontrols2.conf
tests/auto/material/data/tst_material.qml
Task-number: QTBUG-53556
Change-Id: I59970442a09bd72bf0ce53fe838c560ca8daf325
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 2686d14b..59858a5e 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -104,6 +104,7 @@ class QQuickMaterialStyle : public QQuickStyleAttached Q_PROPERTY(QColor listHighlightColor READ listHighlightColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor tooltipColor READ tooltipColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor toolTextColor READ toolTextColor NOTIFY paletteChanged FINAL) + Q_PROPERTY(QColor spinBoxDisabledIconColor READ spinBoxDisabledIconColor NOTIFY paletteChanged FINAL) public: enum Theme { @@ -232,6 +233,7 @@ public: QColor listHighlightColor() const; QColor tooltipColor() const; QColor toolTextColor() const; + QColor spinBoxDisabledIconColor() const; Q_INVOKABLE QColor color(Color color, Shade shade = Shade500) const; Q_INVOKABLE QColor shade(const QColor &color, Shade shade) const; |