summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs/qmessagebox.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-19 01:00:10 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-19 01:00:10 +0100
commit35a461d0261af4178e560df3e3c8fd6fd19bdeb5 (patch)
tree8b4336316bbc992f4f537b3d974472dc75ce8752 /src/widgets/dialogs/qmessagebox.cpp
parent1e654450157ca422833d48c0faf4fe0836c3125f (diff)
parent858c5a73fc7d2bee1d116fb70f723c277bc0dc6d (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/widgets/dialogs/qmessagebox.cpp')
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index 7a6223f45c..854fee6e33 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -756,6 +756,12 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button
*/
/*!
+ \enum QMessageBox::ButtonRole
+
+ \include qdialogbuttonbox.cpp buttonrole-enum
+*/
+
+/*!
\enum QMessageBox::StandardButton
\since 4.2