diff options
| author | Mikko Knuutila <Mikko.Knuutila@Digia.com> | 2011-11-14 09:18:21 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-14 09:18:21 (GMT) |
| commit | 0792215fa8d227617a2080af9f12fd7f486b87d6 (patch) | |
| tree | 8f7f455449378cf4c2a591999f84a5f11e235547 /src/gui | |
| parent | df819cfe17f6dfd089096063524932fc4975804f (diff) | |
| download | Qt-0792215fa8d227617a2080af9f12fd7f486b87d6.zip Qt-0792215fa8d227617a2080af9f12fd7f486b87d6.tar.gz Qt-0792215fa8d227617a2080af9f12fd7f486b87d6.tar.bz2 | |
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 <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/qmessagebox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index 149e267..ba00cd8 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/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; } |