MessageDialog: handle clicked(button, role) signal properly

Depends on I7be753080794adabb784df9b95ac04aa1c29151c in qtbase.
Now the Android native dialog can provide the same functionality as
the QML and QMessageBox implementations.

Change-Id: Icc9c610669742199d48497096524f6cf8ed4d835
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

1 files changed, 39 insertions, 2 deletions

diff --git a/src/imports/dialogs/qquickabstractmessagedialog.cpp b/src/imports/dialogs/qquickabstractmessagedialog.cpp
index cfcf056e6c..a44464962a 100644
--- a/src/imports/dialogs/qquickabstractmessagedialog.cpp
+++ b/src/imports/dialogs/qquickabstractmessagedialog.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qquickabstractmessagedialog_p.h"
+#include <QtGui/qpa/qplatformdialoghelper.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -133,10 +134,46 @@ void QQuickAbstractMessageDialog::setStandardButtons(StandardButtons buttons)
     }
 }
 
-void QQuickAbstractMessageDialog::click(QQuickAbstractMessageDialog::StandardButton button)
+void QQuickAbstractMessageDialog::click(QMessageDialogOptions::StandardButton button, QMessageDialogOptions::ButtonRole role)
 {
-    m_clickedButton = button;
+    setVisible(false);
+    m_clickedButton = static_cast<StandardButton>(button);
     emit buttonClicked();
+    switch (role) {
+    case QMessageDialogOptions::AcceptRole:
+        emit accept();
+        break;
+    case QMessageDialogOptions::RejectRole:
+        emit reject();
+        break;
+    case QMessageDialogOptions::DestructiveRole:
+        emit discard();
+        break;
+    case QMessageDialogOptions::HelpRole:
+        emit help();
+        break;
+    case QMessageDialogOptions::YesRole:
+        emit yes();
+        break;
+    case QMessageDialogOptions::NoRole:
+        emit no();
+        break;
+    case QMessageDialogOptions::ApplyRole:
+        emit apply();
+        break;
+    case QMessageDialogOptions::ResetRole:
+        emit reset();
+        break;
+    default:
+        qWarning("unhandled MessageDialog button %d with role %d", button, role);
+    }
+}
+
+void QQuickAbstractMessageDialog::click(QQuickAbstractMessageDialog::StandardButton button)
+{
+    click(static_cast<QMessageDialogOptions::StandardButton>(button),
+        static_cast<QMessageDialogOptions::ButtonRole>(
+            QMessageDialogOptions::buttonRole(static_cast<QMessageDialogOptions::StandardButton>(button))));
 }
 
 QT_END_NAMESPACE