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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 5501e50c..29ff2c48 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -796,6 +796,11 @@ QColor QQuickMaterialStyle::backgroundDimColor() const return QColor::fromRgba(m_theme == Light ? 0x99303030 : 0x99fafafa); } +QColor QQuickMaterialStyle::listHighlightColor() const +{ + return QColor::fromRgba(m_theme == Light ? 0x1e000000 : 0x1effffff); +} + QColor QQuickMaterialStyle::color(QQuickMaterialStyle::Color color, QQuickMaterialStyle::Shade shade) const { int count = sizeof(colors) / sizeof(colors[0]); |