Platform: create platform dialog instances lazily on demand

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

1 files changed, 16 insertions, 12 deletions

diff --git a/src/imports/platform/qquickplatformmessagedialog.cpp b/src/imports/platform/qquickplatformmessagedialog.cpp
index 3e27e083..2fe4f88f 100644
--- a/src/imports/platform/qquickplatformmessagedialog.cpp
+++ b/src/imports/platform/qquickplatformmessagedialog.cpp
@@ -237,18 +237,6 @@ QQuickPlatformMessageDialog::QQuickPlatformMessageDialog(QObject *parent)
       m_options(QMessageDialogOptions::create()),
       m_clickedButton(QPlatformDialogHelper::NoButton)
 {
-    QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::MessageDialog);
-#ifdef QT_WIDGETS_LIB
-    if (!dialog)
-        dialog = new QWidgetPlatformMessageDialog(this);
-#endif
-    qCDebug(qtLabsPlatformDialogs) << "MessageDialog:" << dialog;
-
-    if (QPlatformMessageDialogHelper *messageDialog = qobject_cast<QPlatformMessageDialogHelper *>(dialog)) {
-        connect(messageDialog, &QPlatformMessageDialogHelper::clicked, this, &QQuickPlatformMessageDialog::handleClick);
-        messageDialog->setOptions(m_options);
-    }
-    setHandle(dialog);
 }
 
 /*!
@@ -371,6 +359,22 @@ QPlatformDialogHelper::StandardButton QQuickPlatformMessageDialog::clickedButton
     return m_clickedButton;
 }
 
+QPlatformDialogHelper *QQuickPlatformMessageDialog::createHelper()
+{
+    QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::MessageDialog);
+#ifdef QT_WIDGETS_LIB
+    if (!dialog)
+        dialog = new QWidgetPlatformMessageDialog(this);
+#endif
+    qCDebug(qtLabsPlatformDialogs) << "MessageDialog:" << dialog;
+
+    if (QPlatformMessageDialogHelper *messageDialog = qobject_cast<QPlatformMessageDialogHelper *>(dialog)) {
+        connect(messageDialog, &QPlatformMessageDialogHelper::clicked, this, &QQuickPlatformMessageDialog::handleClick);
+        messageDialog->setOptions(m_options);
+    }
+    return dialog;
+}
+
 void QQuickPlatformMessageDialog::applyOptions()
 {
     m_options->setWindowTitle(title());