Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3

1 files changed, 21 insertions, 1 deletions

diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
index 3000bd1af1..2c050535d8 100644
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -460,6 +460,26 @@ public:
     void setStandardButtons(QPlatformDialogHelper::StandardButtons buttons);
     QPlatformDialogHelper::StandardButtons standardButtons() const;
 
+    struct CustomButton {
+        explicit CustomButton(
+                int id = -1, const QString &label = QString(),
+                QPlatformDialogHelper::ButtonRole role = QPlatformDialogHelper::InvalidRole,
+                void *button = nullptr) :
+            label(label), role(role), id(id), button(button)
+        {}
+
+        QString label;
+        QPlatformDialogHelper::ButtonRole role;
+        int id;
+        void *button; // strictly internal use only
+    };
+
+    int addButton(const QString &label, QPlatformDialogHelper::ButtonRole role,
+                  void *buttonImpl = nullptr);
+    void removeButton(int id);
+    const QVector<CustomButton> &customButtons();
+    const CustomButton *customButton(int id);
+
 private:
     QMessageDialogOptionsPrivate *d;
 };