diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2017-04-03 09:53:19 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@gmail.com> | 2017-04-03 09:53:19 +0200 |
| commit | 4bd9acec8876e1c36168010758d0fea645a25ba2 (patch) | |
| tree | a79345df4902efdf7827cc6c4ac6aafefdfaa39b /src/imports/controls/material/Popup.qml | |
| parent | c3cc73e3087db62a8427ff569abff1a8289dae83 (diff) | |
| parent | f720bc8e38dfdc14c48ffe3178a704f5d130f932 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/ComboBox.qml
src/imports/controls/material/ComboBox.qml
src/imports/controls/universal/ComboBox.qml
Change-Id: Ib900bb6298c32245399f52980b44575b64b7409f
Diffstat (limited to 'src/imports/controls/material/Popup.qml')
| -rw-r--r-- | src/imports/controls/material/Popup.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml index e270b77d..49b39a6c 100644 --- a/src/imports/controls/material/Popup.qml +++ b/src/imports/controls/material/Popup.qml @@ -47,7 +47,7 @@ T.Popup { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0) + contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) |