diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-06 20:40:54 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-06 21:41:33 +0200 |
| commit | 026353c74a6343281045d42e717cd67e52aaf24c (patch) | |
| tree | 1ad36ce6a7e57d10df808715981bf07c9a6462d6 /src/imports/controls/universal | |
| parent | 0385c432962418431ec5fb4a80d57a5dd9926c6e (diff) | |
| parent | 6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Fusion style ComboBox popup height was adjusted according to 90a0d402
to make tst_controls::ComboBox::test_emptyPopupAfterModelCleared pass
with the Fusion style.
Conflicts:
src/imports/controls/ComboBox.qml
src/imports/controls/material/ComboBox.qml
src/imports/controls/universal/ComboBox.qml
Change-Id: I2bad826dc56de9d8952ea2a9ace950c7cf3cbc58
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 35c4d815..1888f8d4 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -35,6 +35,7 @@ ****************************************************************************/ import QtQuick 2.9 +import QtQuick.Window 2.3 import QtQuick.Controls 2.3 import QtQuick.Controls.impl 2.3 import QtQuick.Templates 2.3 as T @@ -132,7 +133,7 @@ T.ComboBox { popup: T.Popup { width: control.width - implicitHeight: Math.min(396, contentItem.implicitHeight) + height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin) topMargin: 8 bottomMargin: 8 |