Remove "2" from Qt Quick Controls directories

Qt Quick Controls 2 was named that way because it was a follow-up to
Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer
supported, we don't need to have "2" in the name. Work on this was
already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.

By doing this renaming a few weeks before feature freeze, it won't
affect the release but still results in as little time possible spent
manually fixing conflicts in cherry-picks from non-LTS releases as a
result of the renaming.

This patch does the following:

- Renames directories.
- Adapts CMakeLists.txt and other files to account for the new paths.

A follow-up patch will handle documentation.

It does not touch library names or other user-facing stuff, as that
will have to be done in Qt 7.

Task-number: QTBUG-95413
Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 55 insertions, 0 deletions

diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory.cpp
new file mode 100644
index 0000000000..9a63fb0718
--- /dev/null
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory.cpp
@@ -0,0 +1,55 @@
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#include "qquickdialogimplfactory_p.h"
+
+#include <QtCore/qloggingcategory.h>
+
+#include "qquickplatformfiledialog_p.h"
+#include "qquickplatformfolderdialog_p.h"
+#include "qquickplatformfontdialog_p.h"
+#include "qquickplatformcolordialog_p.h"
+#include "qquickplatformmessagedialog_p.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \internal
+
+    Creates concrete QML-based dialogs.
+*/
+
+Q_LOGGING_CATEGORY(lcQuickDialogImplFactory, "qt.quick.dialogs.quickdialogimplfactory")
+
+std::unique_ptr<QPlatformDialogHelper> QQuickDialogImplFactory::createPlatformDialogHelper(QQuickDialogType type, QObject *parent)
+{
+    std::unique_ptr<QPlatformDialogHelper> dialogHelper;
+    switch (type) {
+    case QQuickDialogType::ColorDialog: {
+        dialogHelper.reset(new QQuickPlatformColorDialog(parent));
+        break;
+    }
+    case QQuickDialogType::FileDialog: {
+        dialogHelper.reset(new QQuickPlatformFileDialog(parent));
+        break;
+    }
+    case QQuickDialogType::FolderDialog: {
+        dialogHelper.reset(new QQuickPlatformFolderDialog(parent));
+        break;
+    }
+    case QQuickDialogType::FontDialog: {
+        dialogHelper.reset(new QQuickPlatformFontDialog(parent));
+        break;
+    }
+    case QQuickDialogType::MessageDialog: {
+        dialogHelper.reset(new QQuickPlatformMessageDialog(parent));
+        break;
+    }
+    default:
+        break;
+    }
+
+    return dialogHelper;
+}
+
+QT_END_NAMESPACE