diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-25 20:00:56 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-25 20:00:56 +0100 |
commit | ee6c83db18e65e4eec7b7280213b780576b24c03 (patch) | |
tree | caf049a79f3187962059c7f73181b22b71dc1632 /src/imports/controls/ComboBox.qml | |
parent | 718f6def0b2c4d84bdc8ebdc9633697885747feb (diff) | |
parent | db5780507733ef803e963dcef0b5260c4b94acfa (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/templates/qquickrangeslider_p.h
Change-Id: Ibe8ec18a7e22080f69f316d0394af1d03517ce93
Diffstat (limited to 'src/imports/controls/ComboBox.qml')
-rw-r--r-- | src/imports/controls/ComboBox.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 30f45af3..6e3dc91b 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -101,7 +101,7 @@ T.ComboBox { popup: T.Popup { y: control.height - 1 implicitWidth: control.width - implicitHeight: Math.min(396, listview.contentHeight) + implicitHeight: listview.contentHeight topMargin: 6 bottomMargin: 6 |