From 710058343297bba7cc44fa2369b7cec742f34cb2 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Mon, 12 Mar 2018 10:28:42 +0100
Subject: Don't conflict with Qt Quick Controls 2 when using the platform
 dialogs

Change-Id: I7ca87ee59c8d65537713d5d912fdb3ec5bd7dcdb
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/dialogs/qquickplatformmessagedialog.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/dialogs/qquickplatformmessagedialog.cpp')

diff --git a/src/dialogs/qquickplatformmessagedialog.cpp b/src/dialogs/qquickplatformmessagedialog.cpp
index 2e3afa48..8ba1ea6a 100644
--- a/src/dialogs/qquickplatformmessagedialog.cpp
+++ b/src/dialogs/qquickplatformmessagedialog.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype MessageDialog
-    \instantiates QQuickPlatformMessageDialog
+    \instantiates QQuickPlatformMessageDialog1
     \inqmlmodule QtQuick.Dialogs
     \ingroup qtquickdialogs
     \brief Dialog component for displaying popup messages.
@@ -184,11 +184,11 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \class QQuickPlatformMessageDialog
+    \class QQuickPlatformMessageDialog1
     \inmodule QtQuick.Dialogs
     \internal
 
-    \brief The QQuickPlatformMessageDialog class provides a message dialog
+    \brief The QQuickPlatformMessageDialog1 class provides a message dialog
 
     The dialog is implemented via the QPlatformMessageDialogHelper when possible;
     otherwise it falls back to a QMessageBox or a QML implementation.
@@ -199,7 +199,7 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a file dialog with parent window \a parent.
 */
-QQuickPlatformMessageDialog::QQuickPlatformMessageDialog(QObject *parent) :
+QQuickPlatformMessageDialog1::QQuickPlatformMessageDialog1(QObject *parent) :
     QQuickAbstractMessageDialog(parent)
 {
 }
@@ -207,14 +207,14 @@ QQuickPlatformMessageDialog::QQuickPlatformMessageDialog(QObject *parent) :
 /*!
     Destroys the file dialog.
 */
-QQuickPlatformMessageDialog::~QQuickPlatformMessageDialog()
+QQuickPlatformMessageDialog1::~QQuickPlatformMessageDialog1()
 {
     if (m_dlgHelper)
         m_dlgHelper->hide();
     delete m_dlgHelper;
 }
 
-QPlatformMessageDialogHelper *QQuickPlatformMessageDialog::helper()
+QPlatformMessageDialogHelper *QQuickPlatformMessageDialog1::helper()
 {
     QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent());
     if (parentItem)
-- 
cgit v1.2.1