diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 22:47:08 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 22:47:08 +0200 |
| commit | dcc6b454718c5e58c31d3699d2c7a5e8de195d5f (patch) | |
| tree | b10ff6845c6ad89e669df17733258bc3b1afa73f /src/imports/controls/material | |
| parent | 39d6ede82375aeffb8615f48963f1e95815b3b51 (diff) | |
| parent | 6e8533b741f4fd527f17d17e7730489661ae91a5 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/imports/controls/material/ComboBox.qml
Change-Id: Ie517a07a63cd74ce2d506a68ee24060dce977bf7
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/ComboBox.qml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index df614f3f..d1e36003 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -58,6 +58,9 @@ T.ComboBox { hoverEnabled: Qt.styleHints.useHoverEffects + // Don't use toolTextColor, as that is often white when we have a white background. + Material.foreground: Material.foreground === Material.toolTextColor ? undefined : Material.foreground + delegate: MenuItem { width: control.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData |