Platform dialogs: pass the dialog type to QQuickPlatformDialog ctor

Change-Id: I42b5e403e6cb16e607d9ce0d0e9f624b150bec03
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

7 files changed, 16 insertions, 7 deletions

diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp
index 7d14231e..257095e3 100644
--- a/src/imports/platform/qquickplatformcolordialog.cpp
+++ b/src/imports/platform/qquickplatformcolordialog.cpp
@@ -98,7 +98,8 @@ QT_BEGIN_NAMESPACE
 Q_DECLARE_LOGGING_CATEGORY(qtLabsPlatformDialogs)
 
 QQuickPlatformColorDialog::QQuickPlatformColorDialog(QObject *parent)
-    : QQuickPlatformDialog(parent), m_options(QColorDialogOptions::create())
+    : QQuickPlatformDialog(QPlatformTheme::ColorDialog, parent),
+      m_options(QColorDialogOptions::create())
 {
 }
 
diff --git a/src/imports/platform/qquickplatformdialog.cpp b/src/imports/platform/qquickplatformdialog.cpp
index 684a599f..09d1919a 100644
--- a/src/imports/platform/qquickplatformdialog.cpp
+++ b/src/imports/platform/qquickplatformdialog.cpp
@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
     \sa accepted()
 */
 
-QQuickPlatformDialog::QQuickPlatformDialog(QObject *parent)
+QQuickPlatformDialog::QQuickPlatformDialog(QPlatformTheme::DialogType type, QObject *parent)
     : QObject(parent),
       m_visible(false),
       m_complete(false),
@@ -89,6 +89,7 @@ QQuickPlatformDialog::QQuickPlatformDialog(QObject *parent)
       m_parentWindow(nullptr),
       m_flags(Qt::Dialog),
       m_modality(Qt::WindowModal),
+      m_type(type),
       m_handle(nullptr)
 {
 }
diff --git a/src/imports/platform/qquickplatformdialog_p.h b/src/imports/platform/qquickplatformdialog_p.h
index 1a7ff39d..967da7a2 100644
--- a/src/imports/platform/qquickplatformdialog_p.h
+++ b/src/imports/platform/qquickplatformdialog_p.h
@@ -49,6 +49,7 @@
 //
 
 #include <QtCore/qobject.h>
+#include <QtGui/qpa/qplatformtheme.h>
 #include <QtGui/qpa/qplatformdialoghelper.h>
 #include <QtQml/qqmlparserstatus.h>
 #include <QtQml/qqmllist.h>
@@ -74,7 +75,7 @@ class QQuickPlatformDialog : public QObject, public QQmlParserStatus
     Q_ENUMS(StandardCode)
 
 public:
-    explicit QQuickPlatformDialog(QObject *parent = nullptr);
+    explicit QQuickPlatformDialog(QPlatformTheme::DialogType type, QObject *parent = nullptr);
     ~QQuickPlatformDialog();
 
     QPlatformDialogHelper *handle() const;
@@ -138,6 +139,7 @@ private:
     QString m_title;
     Qt::WindowFlags m_flags;
     Qt::WindowModality m_modality;
+    QPlatformTheme::DialogType m_type;
     QList<QObject *> m_data;
     QPlatformDialogHelper *m_handle;
 };
diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp
index 50012354..03d145af 100644
--- a/src/imports/platform/qquickplatformfiledialog.cpp
+++ b/src/imports/platform/qquickplatformfiledialog.cpp
@@ -104,7 +104,9 @@ QT_BEGIN_NAMESPACE
 Q_DECLARE_LOGGING_CATEGORY(qtLabsPlatformDialogs)
 
 QQuickPlatformFileDialog::QQuickPlatformFileDialog(QObject *parent)
-    : QQuickPlatformDialog(parent), m_fileMode(OpenFile), m_options(QFileDialogOptions::create())
+    : QQuickPlatformDialog(QPlatformTheme::FileDialog, parent),
+      m_fileMode(OpenFile),
+      m_options(QFileDialogOptions::create())
 {
     m_options->setFileMode(QFileDialogOptions::ExistingFile);
     m_options->setAcceptMode(QFileDialogOptions::AcceptOpen);
diff --git a/src/imports/platform/qquickplatformfolderdialog.cpp b/src/imports/platform/qquickplatformfolderdialog.cpp
index 5d7718f5..96c0add3 100644
--- a/src/imports/platform/qquickplatformfolderdialog.cpp
+++ b/src/imports/platform/qquickplatformfolderdialog.cpp
@@ -103,7 +103,8 @@ QT_BEGIN_NAMESPACE
 Q_DECLARE_LOGGING_CATEGORY(qtLabsPlatformDialogs)
 
 QQuickPlatformFolderDialog::QQuickPlatformFolderDialog(QObject *parent)
-    : QQuickPlatformDialog(parent), m_options(QFileDialogOptions::create())
+    : QQuickPlatformDialog(QPlatformTheme::FileDialog, parent),
+      m_options(QFileDialogOptions::create())
 {
     m_options->setFileMode(QFileDialogOptions::Directory);
     m_options->setAcceptMode(QFileDialogOptions::AcceptOpen);
diff --git a/src/imports/platform/qquickplatformfontdialog.cpp b/src/imports/platform/qquickplatformfontdialog.cpp
index 1643c89b..40598998 100644
--- a/src/imports/platform/qquickplatformfontdialog.cpp
+++ b/src/imports/platform/qquickplatformfontdialog.cpp
@@ -98,7 +98,8 @@ QT_BEGIN_NAMESPACE
 Q_DECLARE_LOGGING_CATEGORY(qtLabsPlatformDialogs)
 
 QQuickPlatformFontDialog::QQuickPlatformFontDialog(QObject *parent)
-    : QQuickPlatformDialog(parent), m_options(QFontDialogOptions::create())
+    : QQuickPlatformDialog(QPlatformTheme::FontDialog, parent),
+      m_options(QFontDialogOptions::create())
 {
 }
 
diff --git a/src/imports/platform/qquickplatformmessagedialog.cpp b/src/imports/platform/qquickplatformmessagedialog.cpp
index 59e617ba..b8d84864 100644
--- a/src/imports/platform/qquickplatformmessagedialog.cpp
+++ b/src/imports/platform/qquickplatformmessagedialog.cpp
@@ -233,7 +233,8 @@ QT_BEGIN_NAMESPACE
 Q_DECLARE_LOGGING_CATEGORY(qtLabsPlatformDialogs)
 
 QQuickPlatformMessageDialog::QQuickPlatformMessageDialog(QObject *parent)
-    : QQuickPlatformDialog(parent), m_options(QMessageDialogOptions::create())
+    : QQuickPlatformDialog(QPlatformTheme::MessageDialog, parent),
+      m_options(QMessageDialogOptions::create())
 {
 }