Platform: create platform dialog instances lazily on demand

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

1 files changed, 17 insertions, 13 deletions

diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp
index c86c0030..b71797f5 100644
--- a/src/imports/platform/qquickplatformcolordialog.cpp
+++ b/src/imports/platform/qquickplatformcolordialog.cpp
@@ -102,19 +102,6 @@ Q_DECLARE_LOGGING_CATEGORY(qtLabsPlatformDialogs)
 QQuickPlatformColorDialog::QQuickPlatformColorDialog(QObject *parent)
     : QQuickPlatformDialog(parent), m_options(QColorDialogOptions::create())
 {
-    QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::ColorDialog);
-#ifdef QT_WIDGETS_LIB
-    if (!dialog)
-        dialog = new QWidgetPlatformColorDialog(this);
-#endif
-    qCDebug(qtLabsPlatformDialogs) << "ColorDialog:" << dialog;
-
-    if (QPlatformColorDialogHelper *colorDialog = qobject_cast<QPlatformColorDialogHelper *>(dialog)) {
-        connect(colorDialog, &QPlatformColorDialogHelper::currentColorChanged, this, &QQuickPlatformColorDialog::currentColorChanged);
-        connect(colorDialog, &QPlatformColorDialogHelper::colorSelected, this, &QQuickPlatformColorDialog::colorSelected);
-        colorDialog->setOptions(m_options);
-    }
-    setHandle(dialog);
 }
 
 /*!
@@ -166,6 +153,23 @@ void QQuickPlatformColorDialog::setOptions(QColorDialogOptions::ColorDialogOptio
     emit optionsChanged();
 }
 
+QPlatformDialogHelper *QQuickPlatformColorDialog::createHelper()
+{
+    QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::ColorDialog);
+#ifdef QT_WIDGETS_LIB
+    if (!dialog)
+        dialog = new QWidgetPlatformColorDialog(this);
+#endif
+    qCDebug(qtLabsPlatformDialogs) << "ColorDialog:" << dialog;
+
+    if (QPlatformColorDialogHelper *colorDialog = qobject_cast<QPlatformColorDialogHelper *>(dialog)) {
+        connect(colorDialog, &QPlatformColorDialogHelper::currentColorChanged, this, &QQuickPlatformColorDialog::currentColorChanged);
+        connect(colorDialog, &QPlatformColorDialogHelper::colorSelected, this, &QQuickPlatformColorDialog::colorSelected);
+        colorDialog->setOptions(m_options);
+    }
+    return dialog;
+}
+
 void QQuickPlatformColorDialog::applyOptions()
 {
     m_options->setWindowTitle(title());