diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-20 12:55:54 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-20 12:55:54 +0100 |
| commit | bc29da5c224d277dfa94ae4e188df1db325ae83a (patch) | |
| tree | 19eef227a11ab099fd04b909d326201ae7df7d8d /src/imports/controls/material | |
| parent | 5934c9670eaa6f0464c45857d72bcebf64902cc4 (diff) | |
| parent | c1b1e9a69a5770a59d0a4e59650c6487b9cd5439 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quicktemplates2/qquickswitch.cpp
src/quicktemplates2/qquickswitchdelegate.cpp
tests/auto/controls/data/tst_dialogbuttonbox.qml
tests/auto/controls/data/tst_toolbutton.qml
Change-Id: I1da1d6de83c1d9ac854dfce1d6c9d6ba2c460404
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 2bdf9afa..0721e8f3 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -71,6 +71,8 @@ T.ComboBox { x: control.mirrored ? control.padding : control.width - width - control.padding 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: T.TextField { |