diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-31 16:05:25 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-31 17:38:37 +0100 |
| commit | 19b967506deea84a0d56375e5bcca48168a3cfc8 (patch) | |
| tree | bf488dc01069b7850cceff182c2241ed13db69c6 /src/imports/controls/universal/ComboBox.qml | |
| parent | 8318deb165047d592523ec0b2fd10510d4953b37 (diff) | |
| parent | 7fc567eda8a187e365f4c29c6e8f08440bf31218 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/templates/qquickpopup.cpp
src/templates/qquickpopup_p_p.h
src/templates/qquickspinbox_p.h
Change-Id: Ief25ad2d27410f62e90879f60499ed87359406c3
Diffstat (limited to 'src/imports/controls/universal/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 0a5701b9..f736ef96 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -111,7 +111,9 @@ T.ComboBox { //! [popup] popup: T.Popup { implicitWidth: control.width - implicitHeight: Math.min(200, listview.contentHeight) // TODO: 396 + implicitHeight: Math.min(396, listview.contentHeight) + topMargin: 8 + bottomMargin: 8 contentItem: ListView { id: listview @@ -119,7 +121,7 @@ T.ComboBox { model: control.popup.visible ? control.delegateModel : null currentIndex: control.highlightedIndex -// ScrollIndicator.vertical: ScrollIndicator { } + T.ScrollIndicator.vertical: ScrollIndicator { } } background: Rectangle { |