diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:50:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:50:52 +0200 |
| commit | 0524ddb9489cd9816fadc330f75efc7b40994013 (patch) | |
| tree | 834607a15e646d416e2512f8f4a05ae222495de5 /src/imports/controls/universal/ComboBox.qml | |
| parent | 2568869819863de6b1f303dfe470aedf38b841c3 (diff) | |
| parent | 53c780f15c2d170514f74d949a8165033275bddd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/material/qquickmaterialstyle.cpp
src/imports/controls/universal/qquickuniversalstyle.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquicktooltip.cpp
tests/auto/auto.pro
Change-Id: I88b347dd85278e14f7b2ca468e30648c6432b6f2
Diffstat (limited to 'src/imports/controls/universal/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 0fe49520..e259d092 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -59,7 +59,7 @@ T.ComboBox { bottomPadding: padding - 5 delegate: ItemDelegate { - width: control.width + width: control.popup.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled |