From 33f66acb3671e6fd658ac8bcbe7db8d608964abf Mon Sep 17 00:00:00 2001 From: Mikko Knuutila Date: Mon, 14 Nov 2011 10:18:21 +0100 Subject: Fix for the button size calculation in qmessagebox.cpp Actually use the calculated size for needed space instead of just ignoring the return value. Task-number: QTBUG-16315 Reviewed-by: Friedemann Kleint (cherry picked from commit 0792215fa8d227617a2080af9f12fd7f486b87d6) Change-Id: I0792215fa8d227617a2080af9f12fd7f486b87d6 --- src/widgets/dialogs/qmessagebox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 93e9a34415..1dbdeff1a7 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -153,7 +153,7 @@ public: expandedTo(QApplication::globalStrut()); opt.text = label(HideLabel); sz = fm.size(Qt::TextShowMnemonic, opt.text); - ret.expandedTo(style()->sizeFromContents(QStyle::CT_PushButton, &opt, sz, this). + ret = ret.expandedTo(style()->sizeFromContents(QStyle::CT_PushButton, &opt, sz, this). expandedTo(QApplication::globalStrut())); return ret; } -- cgit v1.2.3