diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-21 14:06:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-21 14:06:03 +0100 |
| commit | 1b2e0d509ed8df858a621908936114544cddc55f (patch) | |
| tree | c2917dfeb3c802642ebcc28407d089c5a9c95afb /src/imports/controls/universal | |
| parent | 745ff8a9186d40c5c53f8ffa0a26d2730e6c214d (diff) | |
| parent | acebfc7f1e50386a83c1f039399cf5cf914b893e (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I48383fc70de754394259d5dfd19c7b25f1280f67
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/DialogButtonBox.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index ac2dc541..0458c39d 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -43,9 +43,10 @@ T.DialogButtonBox { id: control implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - (control.count === 1 ? contentWidth * 2 : contentWidth) + leftPadding + rightPadding) + (control.count === 1 ? implicitContentWidth * 2 : implicitContentWidth) + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) + contentWidth: contentItem.contentWidth spacing: 4 padding: 24 |