AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMessageBox: Reset clickedButton for each invocation of the dialog

Browse Source 
When showing a messagebox that has already been show we don't want to
keep around the clicked button of the previous invocation.

Pick-to: 6.2
Change-Id: Ib6f6293d40ab338c550ea344094db871ccf45c46
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Tor Arne Vestbø 2021-09-03 18:28:00 +02:00 committed by Volker Hilsheimer
parent 673ed80fa4
commit 2262744ad0
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/dialogs/qmessagebox.cpp
View File

@ -1593,6 +1593,7 @@ void QMessageBox::showEvent(QShowEvent *e)
} }
if (d->detailsButton) if (d->detailsButton)
addButton(d->detailsButton, QMessageBox::ActionRole); addButton(d->detailsButton, QMessageBox::ActionRole);
d->clickedButton = nullptr;
d->detectEscapeButton(); d->detectEscapeButton();
d->updateSize(); d->updateSize();

23
tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
View File

@ -50,6 +50,7 @@ private slots:
void sanityTest(); void sanityTest();
void defaultButton(); void defaultButton();
void escapeButton(); void escapeButton();
void clickedButton();
void button(); void button();
void statics(); void statics();
void about(); void about();
@ -302,6 +303,28 @@ void tst_QMessageBox::escapeButton()
QVERIFY(msgBox3.clickedButton() == msgBox3.button(QMessageBox::Ok)); // auto detected QVERIFY(msgBox3.clickedButton() == msgBox3.button(QMessageBox::Ok)); // auto detected
} }
void tst_QMessageBox::clickedButton()
{
QMessageBox msgBox;
msgBox.addButton(QMessageBox::Yes);
msgBox.addButton(QMessageBox::No);
msgBox.addButton(QMessageBox::Retry);
QVERIFY(!msgBox.clickedButton());
for (int i = 0; i < 2; ++i) {
QAbstractButton *clickedButtonAfterExex = nullptr;
QTimer::singleShot(100, [&] {
clickedButtonAfterExex = msgBox.clickedButton();
msgBox.close();
});
msgBox.exec();
QVERIFY(!clickedButtonAfterExex);
QVERIFY(msgBox.clickedButton());
}
}
void tst_QMessageBox::statics() void tst_QMessageBox::statics()
{ {
QMessageBox::StandardButton (*statics[4])(QWidget *, const QString &, QMessageBox::StandardButton (*statics[4])(QWidget *, const QString &,