3 files changed, 36 insertions, 36 deletions
diff --git a/src/dialogs/qquickabstractmessagedialog.cpp b/src/dialogs/qquickabstractmessagedialog.cpp
index a44464962..2c24c4ba6 100644
--- a/src/dialogs/qquickabstractmessagedialog.cpp
+++ b/src/dialogs/qquickabstractmessagedialog.cpp
@@ -129,51 +129,51 @@ QUrl QQuickAbstractMessageDialog::standardIconSource()
 void QQuickAbstractMessageDialog::setStandardButtons(StandardButtons buttons)
 {
     if (buttons != m_options->standardButtons()) {
-        m_options->setStandardButtons(static_cast<QMessageDialogOptions::StandardButtons>(static_cast<int>(buttons)));
+        m_options->setStandardButtons(static_cast<QPlatformDialogHelper::StandardButtons>(static_cast<int>(buttons)));
         emit standardButtonsChanged();
     }
 }
 
-void QQuickAbstractMessageDialog::click(QMessageDialogOptions::StandardButton button, QMessageDialogOptions::ButtonRole role)
+void QQuickAbstractMessageDialog::click(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole role)
 {
     setVisible(false);
     m_clickedButton = static_cast<StandardButton>(button);
     emit buttonClicked();
     switch (role) {
-    case QMessageDialogOptions::AcceptRole:
+    case QPlatformDialogHelper::AcceptRole:
         emit accept();
         break;
-    case QMessageDialogOptions::RejectRole:
+    case QPlatformDialogHelper::RejectRole:
         emit reject();
         break;
-    case QMessageDialogOptions::DestructiveRole:
+    case QPlatformDialogHelper::DestructiveRole:
         emit discard();
         break;
-    case QMessageDialogOptions::HelpRole:
+    case QPlatformDialogHelper::HelpRole:
         emit help();
         break;
-    case QMessageDialogOptions::YesRole:
+    case QPlatformDialogHelper::YesRole:
         emit yes();
         break;
-    case QMessageDialogOptions::NoRole:
+    case QPlatformDialogHelper::NoRole:
         emit no();
         break;
-    case QMessageDialogOptions::ApplyRole:
+    case QPlatformDialogHelper::ApplyRole:
         emit apply();
         break;
-    case QMessageDialogOptions::ResetRole:
+    case QPlatformDialogHelper::ResetRole:
         emit reset();
         break;
     default:
-        qWarning("unhandled MessageDialog button %d with role %d", button, role);
+        qWarning("unhandled MessageDialog button %d with role %d", (int)button, (int)role);
     }
 }
 
 void QQuickAbstractMessageDialog::click(QQuickAbstractMessageDialog::StandardButton button)
 {
-    click(static_cast<QMessageDialogOptions::StandardButton>(button),
-        static_cast<QMessageDialogOptions::ButtonRole>(
-            QMessageDialogOptions::buttonRole(static_cast<QMessageDialogOptions::StandardButton>(button))));
+    click(static_cast<QPlatformDialogHelper::StandardButton>(button),
+        static_cast<QPlatformDialogHelper::ButtonRole>(
+            QPlatformDialogHelper::buttonRole(static_cast<QPlatformDialogHelper::StandardButton>(button))));
 }
 
 QT_END_NAMESPACE
diff --git a/src/dialogs/qquickabstractmessagedialog_p.h b/src/dialogs/qquickabstractmessagedialog_p.h
index f2427bb2e..2afea1dc0 100644
--- a/src/dialogs/qquickabstractmessagedialog_p.h
+++ b/src/dialogs/qquickabstractmessagedialog_p.h
@@ -99,25 +99,25 @@ public:
     QUrl standardIconSource();
 
     enum StandardButton {
-        NoButton           = QMessageDialogOptions::NoButton,
-        Ok                 = QMessageDialogOptions::Ok,
-        Save               = QMessageDialogOptions::Save,
-        SaveAll            = QMessageDialogOptions::SaveAll,
-        Open               = QMessageDialogOptions::Open,
-        Yes                = QMessageDialogOptions::Yes,
-        YesToAll           = QMessageDialogOptions::YesToAll,
-        No                 = QMessageDialogOptions::No,
-        NoToAll            = QMessageDialogOptions::NoToAll,
-        Abort              = QMessageDialogOptions::Abort,
-        Retry              = QMessageDialogOptions::Retry,
-        Ignore             = QMessageDialogOptions::Ignore,
-        Close              = QMessageDialogOptions::Close,
-        Cancel             = QMessageDialogOptions::Cancel,
-        Discard            = QMessageDialogOptions::Discard,
-        Help               = QMessageDialogOptions::Help,
-        Apply              = QMessageDialogOptions::Apply,
-        Reset              = QMessageDialogOptions::Reset,
-        RestoreDefaults    = QMessageDialogOptions::RestoreDefaults
+        NoButton           = QPlatformDialogHelper::NoButton,
+        Ok                 = QPlatformDialogHelper::Ok,
+        Save               = QPlatformDialogHelper::Save,
+        SaveAll            = QPlatformDialogHelper::SaveAll,
+        Open               = QPlatformDialogHelper::Open,
+        Yes                = QPlatformDialogHelper::Yes,
+        YesToAll           = QPlatformDialogHelper::YesToAll,
+        No                 = QPlatformDialogHelper::No,
+        NoToAll            = QPlatformDialogHelper::NoToAll,
+        Abort              = QPlatformDialogHelper::Abort,
+        Retry              = QPlatformDialogHelper::Retry,
+        Ignore             = QPlatformDialogHelper::Ignore,
+        Close              = QPlatformDialogHelper::Close,
+        Cancel             = QPlatformDialogHelper::Cancel,
+        Discard            = QPlatformDialogHelper::Discard,
+        Help               = QPlatformDialogHelper::Help,
+        Apply              = QPlatformDialogHelper::Apply,
+        Reset              = QPlatformDialogHelper::Reset,
+        RestoreDefaults    = QPlatformDialogHelper::RestoreDefaults
     };
     Q_DECLARE_FLAGS(StandardButtons, StandardButton)
 
@@ -133,7 +133,7 @@ public Q_SLOTS:
     void setDetailedText(const QString &arg);
     void setIcon(Icon icon);
     void setStandardButtons(StandardButtons buttons);
-    void click(QMessageDialogOptions::StandardButton button, QMessageDialogOptions::ButtonRole);
+    void click(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole);
     void click(QQuickAbstractMessageDialog::StandardButton button);
 
 Q_SIGNALS:
diff --git a/src/widgets/qmessageboxhelper_p.h b/src/widgets/qmessageboxhelper_p.h
index 4f1070f97..bf3eef32d 100644
--- a/src/widgets/qmessageboxhelper_p.h
+++ b/src/widgets/qmessageboxhelper_p.h
@@ -97,8 +97,8 @@ public:
 
 public Q_SLOTS:
     void buttonClicked(QAbstractButton* button) {
-        emit clicked(static_cast<QMessageDialogOptions::StandardButton>(m_dialog.standardButton(button)),
-            static_cast<QMessageDialogOptions::ButtonRole>(m_dialog.buttonRole(button)));
+        emit clicked(static_cast<QPlatformDialogHelper::StandardButton>(m_dialog.standardButton(button)),
+            static_cast<QPlatformDialogHelper::ButtonRole>(m_dialog.buttonRole(button)));
     }
 };