aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-11-07 12:20:59 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2016-11-07 11:40:59 +0000
commitbefe5e0dca3b5af7ffa48b0f66794b083d43656f (patch)
tree2a1cf0c542c4d36f684a87d84f8ecaf52f53b077 /src/imports
parent75dd3a665382ed3ed13a5db17dce8636a203ad64 (diff)
Improve the custom ComboBox example
Cut the dependency between the popup and its content item. The same was done for all the built-in styles in 50148c6. Task-number: QTBUG-56297 Change-Id: I18d83bd5dd92cd4f2798ac17b469725d08368da9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-custom.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-custom.qml b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-custom.qml
index 12d56a56..f7d6792f 100644
--- a/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-custom.qml
+++ b/src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-combobox-custom.qml
@@ -92,12 +92,12 @@ ComboBox {
popup: Popup {
y: control.height - 1
width: control.width
- implicitHeight: listview.contentHeight
+ implicitHeight: contentItem.implicitHeight
padding: 1
contentItem: ListView {
- id: listview
clip: true
+ implicitHeight: contentHeight
model: control.popup.visible ? control.delegateModel : null
currentIndex: control.highlightedIndex