Rename QQuickDialog to QQuickDialog1v5.8.0-beta1

This fixes a linking error when Qt is built statically and both
Qt Quick Controls 1 and Qt Quick Controls 2 are used in the same
application, due to Qt Quick Controls 2 also containing a class named
QQuickDialog.

Change-Id: I16ad8b1a3c75d0fa3e4ba1c3ab54a63caf05bbea
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Alex Leutgöb <alex@v-play.net>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>

5 files changed, 23 insertions, 23 deletions

diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp
index 23eeac38..5a13bc9b 100644
--- a/src/dialogs/plugin.cpp
+++ b/src/dialogs/plugin.cpp
@@ -177,7 +177,7 @@ public:
         // Dialog
         {
             // @uri QtQuick.Dialogs.AbstractDialog
-            qmlRegisterType<QQuickDialog>(uri, 1, 2, "AbstractDialog"); // implementation wrapper
+            qmlRegisterType<QQuickDialog1>(uri, 1, 2, "AbstractDialog"); // implementation wrapper
             QUrl dialogQmlPath = m_useResources ?
                 QUrl("qrc:/QtQuick/Dialogs/DefaultDialogWrapper.qml") :
 #ifndef QT_STATIC
diff --git a/src/dialogs/plugins.qmltypes b/src/dialogs/plugins.qmltypes
index 6e21c16f..82c910ed 100644
--- a/src/dialogs/plugins.qmltypes
+++ b/src/dialogs/plugins.qmltypes
@@ -325,7 +325,7 @@ Module {
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
     }
     Component {
-        name: "QQuickDialog"
+        name: "QQuickDialog1"
         defaultProperty: "contentItem"
         prototype: "QQuickAbstractDialog"
         exports: ["QtQuick.Dialogs/AbstractDialog 1.2"]
diff --git a/src/dialogs/qquickabstractdialog_p.h b/src/dialogs/qquickabstractdialog_p.h
index 0a761bf3..54dbaace 100644
--- a/src/dialogs/qquickabstractdialog_p.h
+++ b/src/dialogs/qquickabstractdialog_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 class QQuickAbstractDialog : public QObject
 {
     Q_OBJECT
-    // TODO move the enum to QQuickDialog at the same time that QQuickMessageDialog inherits from it
+    // TODO move the enum to QQuickDialog1 at the same time that QQuickMessageDialog inherits from it
     Q_ENUMS(StandardButton)
     Q_FLAGS(StandardButtons)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibilityChanged)
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp
index 33e3b02b..485eeb43 100644
--- a/src/dialogs/qquickdialog.cpp
+++ b/src/dialogs/qquickdialog.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Dialog
-    \instantiates QQuickDialog
+    \instantiates QQuickDialog1
     \inqmlmodule QtQuick.Dialogs
     \ingroup qtquickdialogs
     \brief A generic QtQuick dialog wrapper with standard buttons.
@@ -203,11 +203,11 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \class QQuickDialog
+    \class QQuickDialog1
     \inmodule QtQuick.Dialogs
     \internal
 
-    The QQuickDialog class represents a container for arbitrary
+    The QQuickDialog1 class represents a container for arbitrary
     dialog contents.
 
     \since 5.3
@@ -216,7 +216,7 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a dialog wrapper with parent window \a parent.
 */
-QQuickDialog::QQuickDialog(QObject *parent)
+QQuickDialog1::QQuickDialog1(QObject *parent)
     : QQuickAbstractDialog(parent)
     , m_enabledButtons(Ok)
     , m_clickedButton(NoButton)
@@ -227,30 +227,30 @@ QQuickDialog::QQuickDialog(QObject *parent)
 /*!
     Destroys the dialog wrapper.
 */
-QQuickDialog::~QQuickDialog()
+QQuickDialog1::~QQuickDialog1()
 {
 }
 
-QJSValue QQuickDialog::__standardButtonsLeftModel()
+QJSValue QQuickDialog1::__standardButtonsLeftModel()
 {
     updateStandardButtons();
     return m_standardButtonsLeftModel;
 }
 
-QJSValue QQuickDialog::__standardButtonsRightModel()
+QJSValue QQuickDialog1::__standardButtonsRightModel()
 {
     updateStandardButtons();
     return m_standardButtonsRightModel;
 }
 
-void QQuickDialog::setVisible(bool v)
+void QQuickDialog1::setVisible(bool v)
 {
     if (v)
         m_clickedButton = NoButton;
     QQuickAbstractDialog::setVisible(v);
 }
 
-void QQuickDialog::updateStandardButtons()
+void QQuickDialog1::updateStandardButtons()
 {
     if (m_standardButtonsRightModel.isUndefined()) {
         QJSEngine *engine = qmlEngine(this);
@@ -293,7 +293,7 @@ void QQuickDialog::updateStandardButtons()
     }
 }
 
-void QQuickDialog::setTitle(const QString &arg)
+void QQuickDialog1::setTitle(const QString &arg)
 {
     if (m_title != arg) {
         m_title = arg;
@@ -301,7 +301,7 @@ void QQuickDialog::setTitle(const QString &arg)
     }
 }
 
-void QQuickDialog::setStandardButtons(StandardButtons buttons)
+void QQuickDialog1::setStandardButtons(StandardButtons buttons)
 {
     m_enabledButtons = buttons;
     m_standardButtonsLeftModel = QJSValue();
@@ -339,7 +339,7 @@ void QQuickDialog::setStandardButtons(StandardButtons buttons)
     \endqml
 */
 
-void QQuickDialog::click(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole role)
+void QQuickDialog1::click(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole role)
 {
     m_clickedButton = static_cast<StandardButton>(button);
     emit buttonClicked();
@@ -378,21 +378,21 @@ void QQuickDialog::click(QPlatformDialogHelper::StandardButton button, QPlatform
     }
 }
 
-void QQuickDialog::click(QQuickAbstractDialog::StandardButton button)
+void QQuickDialog1::click(QQuickAbstractDialog::StandardButton button)
 {
     click(static_cast<QPlatformDialogHelper::StandardButton>(button),
         static_cast<QPlatformDialogHelper::ButtonRole>(
             QPlatformDialogHelper::buttonRole(static_cast<QPlatformDialogHelper::StandardButton>(button))));
 }
 
-void QQuickDialog::accept() {
+void QQuickDialog1::accept() {
     // enter key is treated like OK
     if (m_clickedButton == NoButton)
         m_clickedButton = Ok;
     QQuickAbstractDialog::accept();
 }
 
-void QQuickDialog::reject() {
+void QQuickDialog1::reject() {
     // escape key is treated like cancel
     if (m_clickedButton == NoButton)
         m_clickedButton = Cancel;
diff --git a/src/dialogs/qquickdialog_p.h b/src/dialogs/qquickdialog_p.h
index 262ddb63..fec4ec9a 100644
--- a/src/dialogs/qquickdialog_p.h
+++ b/src/dialogs/qquickdialog_p.h
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDialog : public QQuickAbstractDialog
+class QQuickDialog1 : public QQuickAbstractDialog
 {
     Q_OBJECT
 
@@ -70,8 +70,8 @@ class QQuickDialog : public QQuickAbstractDialog
     Q_CLASSINFO("DefaultProperty", "contentItem")    // Dialog in QML can have only one child
 
 public:
-    explicit QQuickDialog(QObject *parent = 0);
-    ~QQuickDialog();
+    explicit QQuickDialog1(QObject *parent = 0);
+    ~QQuickDialog1();
 
     StandardButtons standardButtons() const { return m_enabledButtons; }
     StandardButton clickedButton() const { return m_clickedButton; }
@@ -114,11 +114,11 @@ private:
     StandardButton m_clickedButton;
     QJSValue m_standardButtonsLeftModel;
     QJSValue m_standardButtonsRightModel;
-    Q_DISABLE_COPY(QQuickDialog)
+    Q_DISABLE_COPY(QQuickDialog1)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickDialog *)
+QML_DECLARE_TYPE(QQuickDialog1 *)
 
 #endif // QQUICKDIALOG_P_H