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, 106 insertions, 0 deletions

diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/quickcontrols/doc/src/qtquickcontrols2-qmltypes.qdoc
new file mode 100644
index 0000000000..f1ff074b57
--- /dev/null
+++ b/src/quickcontrols/doc/src/qtquickcontrols2-qmltypes.qdoc
@@ -0,0 +1,106 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \qmlmodule QtQuick.Controls
+    \keyword Qt Quick Controls QML Types
+    \title Qt Quick Controls QML Types
+    \keyword Qt Quick Controls 2 QML Types
+    \ingroup qmlmodules
+    \brief Provides QML types for user interfaces (Qt Quick Controls).
+
+    \l{Qt Quick Controls} provides QML types for creating user interfaces.
+    These QML types work in conjunction with \l{Qt Quick} and
+    \l{Qt Quick Layouts}.
+
+    Qt Quick Controls QML types can be imported into your application
+    using the following import statement in your .qml file:
+
+    \qml
+    import QtQuick.Controls
+    \endqml
+
+    \section1 QML Types
+    \generatelist {qmltypesbymodule QtQuick.Controls}
+    \noautolist
+
+    \section1 Using Qt Quick Controls types in property declarations
+
+    As mentioned in \l {Qt Quick Templates 2 QML Types}, each type in Qt Quick
+    Controls is backed by a C++ "template" type. These types are \l {Qt Quick
+    Templates 2}{non-visual implementations of controls' logic and behavior}.
+
+    For example, the \l Menu type's API and behavior is defined by the C++
+    type in Qt Quick Templates. Each \l {Definition of a Style}{style} that
+    wants to provide a Menu must have a Menu.qml available, and the root
+    item in that file must be the Menu from Qt Quick Templates. When you
+    import QtQuick.Controls and create a Menu in QML, the type you get is
+    actually the QML Menu defined by the style's Menu.qml.
+
+    In order to use a control as the type in a property declaration, you should
+    use the corresponding type from Qt Quick Templates. For example, suppose
+    you had a \c PopupOpener component, which was a Button that opened a
+    Popup:
+
+    \qml
+    // PopupButton.qml
+    import QtQuick.Controls
+
+    Button {
+        required property Popup popup
+
+        onClicked: popup.open()
+    }
+
+    // main.qml
+    PopupButton {
+        popup: saveChangesDialog
+    }
+
+    Dialog {
+        id: saveChangesDialog
+
+        // ...
+    }
+    \endqml
+
+    Running this code will result in an error:
+
+    \badcode
+    Unable to assign Dialog_QMLTYPE to Popup_QMLTYPE
+    \endcode
+
+    This is because of the inheritance hierarchy:
+
+    \badcode
+    Popup (C++ type in QtQuick.Templates)
+    │   └── Popup (QML type in QtQuick.Controls)
+    └── Dialog (C++ type in QtQuick.Templates)
+        └── Dialog (QML type in QtQuick.Controls)
+    \endcode
+
+    Dialog from \c QtQuick.Controls does not derive from the Popup from
+    \c QtQuick.Controls, but from \c QtQuick.Templates.
+
+    Instead, use the Popup from Qt Quick Templates as the property type:
+
+    \qml
+    // PopupButton.qml
+    import QtQuick.Controls
+    import QtQuick.Templates as T
+
+    Button {
+        required property T.Popup popup
+
+        onClicked: popup.open()
+    }
+    \endqml
+
+    For more information on the Qt Quick Controls module, see the
+    \l {Qt Quick Controls} module documentation.
+
+    \section1 Related Information
+    \list
+    \li \l {Qt Quick Controls Guidelines}
+    \endlist
+*/