diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 03:02:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 03:02:08 +0100 |
| commit | 4a434b19c347a6014f42cbcf0f1493d689e579fc (patch) | |
| tree | b33cb6f0a59f01336d66b73bc30f822aa24e61aa /src/quicktemplates2/qquickdialogbuttonbox.cpp | |
| parent | e78843a23e1485abddf81e10c34048b7e0bd9eaa (diff) | |
| parent | 8b78d9cea3091b0bd94d1ae0c71a000f8e7e1903 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: If27c142786ad2457a80ce1ef65220834eda81e94
Diffstat (limited to 'src/quicktemplates2/qquickdialogbuttonbox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index 8559ad15..03f5f8e8 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -241,11 +241,8 @@ void QQuickDialogButtonBoxPrivate::resizeContent() return; QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding()); - if (alignment != 0) { - qreal cw = (alignment & Qt::AlignHorizontal_Mask) == 0 ? q->availableWidth() : contentItem->property("contentWidth").toReal(); - qreal ch = (alignment & Qt::AlignVertical_Mask) == 0 ? q->availableHeight() : contentItem->property("contentHeight").toReal(); - geometry = alignedRect(q->isMirrored() ? Qt::RightToLeft : Qt::LeftToRight, alignment, QSizeF(cw, ch), geometry); - } + if (alignment != 0) + geometry = alignedRect(q->isMirrored() ? Qt::RightToLeft : Qt::LeftToRight, alignment, QSizeF(contentWidth, contentHeight), geometry); contentItem->setPosition(geometry.topLeft()); contentItem->setSize(geometry.size()); |