From 0792215fa8d227617a2080af9f12fd7f486b87d6 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 --- src/gui/dialogs/qmessagebox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v0.12 From 11a6d868b5613dd7fdbef02198aaf9566fcd1f17 Mon Sep 17 00:00:00 2001 From: Mikko Knuutila Date: Mon, 14 Nov 2011 10:18:22 +0100 Subject: Fix for QMessageBox's autotest. Mnemonic shortcut caused string comparison to fail. Task-number: QTBUG-22119 Reviewed-by: Friedemann Kleint --- tests/auto/qmessagebox/tst_qmessagebox.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp index ed085ce..06e242c 100644 --- a/tests/auto/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp @@ -720,7 +720,8 @@ void tst_QMessageBox::detailsButtonText() QAbstractButton* btn = NULL; foreach(btn, list) { if (btn && (btn->inherits("QPushButton"))) { - if (btn->text() != QMessageBox::tr("OK") && btn->text() != QMessageBox::tr("Show Details...")) { + if (btn->text().remove("&") != QMessageBox::tr("OK") + && btn->text() != QMessageBox::tr("Show Details...")) { QFAIL(qPrintable(QString("Unexpected messagebox button text: %1").arg(btn->text()))); } } -- cgit v0.12