diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-14 21:58:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-14 21:58:48 +0100 |
| commit | 537eced61381f0ce1eabdc797bb0dacd11e11d39 (patch) | |
| tree | 13ccb774329ca0214e89675e5f1d1ffa638f8ef6 /src/imports/controls/material | |
| parent | 698cffce2171bed322aa9d0df1fda316c379efda (diff) | |
| parent | 6f7852a307c7ebbdb3b6efa00cbf7626b072bbc1 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: Ibad627dfcd3389aeddfe08a10d13097c88f081a1
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/ComboBox.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index fbddb32c..c38c2b01 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -74,6 +74,8 @@ T.ComboBox { x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 source: "image://material/drop-indicator/" + (control.enabled ? control.Material.foreground : control.Material.hintTextColor) + sourceSize.width: width + sourceSize.height: height } contentItem: Text { |