diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-16 13:34:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-16 18:48:59 +0200 |
| commit | 8559bf934def636ccff487464adb600d219f8778 (patch) | |
| tree | 3063152f487798c7103dbf61216e48c37586a4e1 /tests/auto/widgets/dialogs/qmessagebox | |
| parent | f1a6b97fe2d3eda9455b13bb79828f250d46b92e (diff) | |
| parent | a0ebd98f58b2d92c34fafbc620f024caa36bf0ad (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I4af138ffb2f5306373244523768209e8873b2798
Diffstat (limited to 'tests/auto/widgets/dialogs/qmessagebox')
| -rw-r--r-- | tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 5c9e0a46cf..049468fd7c 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -331,6 +331,12 @@ void tst_QMessageBox::escapeButton() closeHelper.start(ExecCloseHelper::CloseWindow, &msgBox2); msgBox2.exec(); QVERIFY(msgBox2.clickedButton() == msgBox2.button(QMessageBox::No)); // auto detected (one No button only) + + QMessageBox msgBox3; + msgBox3.setDetailedText("Details"); + closeHelper.start(ExecCloseHelper::CloseWindow, &msgBox3); + msgBox3.exec(); + QVERIFY(msgBox3.clickedButton() == msgBox3.button(QMessageBox::Ok)); // auto detected } void tst_QMessageBox::statics() |