summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dialogs/qquickabstractmessagedialog.cpp4
-rw-r--r--src/dialogs/qquickabstractmessagedialog_p.h2
-rw-r--r--src/widgets/qquickqmessagebox.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/dialogs/qquickabstractmessagedialog.cpp b/src/dialogs/qquickabstractmessagedialog.cpp
index ebaed414..b13c5338 100644
--- a/src/dialogs/qquickabstractmessagedialog.cpp
+++ b/src/dialogs/qquickabstractmessagedialog.cpp
@@ -141,10 +141,10 @@ void QQuickAbstractMessageDialog::click(QPlatformDialogHelper::StandardButton bu
emit buttonClicked();
switch (role) {
case QPlatformDialogHelper::AcceptRole:
- emit accept();
+ accept();
break;
case QPlatformDialogHelper::RejectRole:
- emit reject();
+ reject();
break;
case QPlatformDialogHelper::DestructiveRole:
emit discard();
diff --git a/src/dialogs/qquickabstractmessagedialog_p.h b/src/dialogs/qquickabstractmessagedialog_p.h
index 3cf8ee47..6c1d7f2d 100644
--- a/src/dialogs/qquickabstractmessagedialog_p.h
+++ b/src/dialogs/qquickabstractmessagedialog_p.h
@@ -124,7 +124,7 @@ Q_SIGNALS:
void apply();
void reset();
-protected:
+protected Q_SLOTS:
void click(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole);
protected:
diff --git a/src/widgets/qquickqmessagebox.cpp b/src/widgets/qquickqmessagebox.cpp
index 5d734011..5d62bee6 100644
--- a/src/widgets/qquickqmessagebox.cpp
+++ b/src/widgets/qquickqmessagebox.cpp
@@ -134,8 +134,8 @@ QPlatformDialogHelper *QQuickQMessageBox::helper()
// dismissed by closing the window rather than by one of its button widgets.
connect(helper, SIGNAL(accept()), this, SLOT(accept()));
connect(helper, SIGNAL(reject()), this, SLOT(reject()));
- connect(helper, SIGNAL(clicked(QMessageDialogOptions::StandardButton,QMessageDialogOptions::ButtonRole)),
- this, SLOT(click(QMessageDialogOptions::StandardButton,QMessageDialogOptions::ButtonRole)));
+ connect(helper, SIGNAL(clicked(QPlatformDialogHelper::StandardButton,QPlatformDialogHelper::ButtonRole)),
+ this, SLOT(click(QPlatformDialogHelper::StandardButton,QPlatformDialogHelper::ButtonRole)));
}
return QQuickAbstractMessageDialog::m_dlgHelper;