Change QMessageBox::question to default to yes/no buttons instead of ok

Beside that it also removes a suggestion about making Ok==Yes and
No==Cancel. It would be a problem since we (at least)
can have messageboxes with both yes, no and cancel.

Change-Id: I567979b2e697e7103968d6512fe4835f86888ca3
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index 1ec68fc..96104d9 100644 (file)
--- a/dist/changes-5.0.0
+++ b/dist/changes-5.0.0
@@ -364,3 +364,10 @@ Qt for Windows CE
      construction would not be affected by the QPointer, but now that QPointer
      is implemented using QWeakPoiner, constructing the QSharedPointer will
      cause an abort().
+
+
+- QMessageBox
+
+     * The static function QMessageBox::question has changed the default argument
+     for buttons. Before the default was to have an Ok button. That is changed
+     to having a yes and a no button.

diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h
index 4774389..c157a9b 100644 (file)
--- a/src/widgets/dialogs/qmessagebox.h
+++ b/src/widgets/dialogs/qmessagebox.h
@@ -191,10 +191,8 @@ public:
     static StandardButton information(QWidget *parent, const QString &title,
          const QString &text, StandardButtons buttons = Ok,
          StandardButton defaultButton = NoButton);
-    // ### Qt 5: Replace Ok with Yes|No in question() function.
-    //     Also consider if Ok == Yes and Cancel == No.
     static StandardButton question(QWidget *parent, const QString &title,
-         const QString &text, StandardButtons buttons = Ok,
+         const QString &text, StandardButtons buttons = StandardButtons(Yes | No),
          StandardButton defaultButton = NoButton);
     static StandardButton warning(QWidget *parent, const QString &title,
          const QString &text, StandardButtons buttons = Ok,