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

diff --git a/src/quickcontrolsimpl/qquickiconlabel_p_p.h b/src/quickcontrolsimpl/qquickiconlabel_p_p.h
new file mode 100644
index 0000000000..8efdd56e21
--- /dev/null
+++ b/src/quickcontrolsimpl/qquickiconlabel_p_p.h
@@ -0,0 +1,80 @@
+// Copyright (C) 2017 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
+
+#ifndef QQUICKICONLABEL_P_P_H
+#define QQUICKICONLABEL_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQuick/private/qquickitem_p.h>
+#include <QtQuickControls2Impl/private/qtquickcontrols2implglobal_p.h>
+#include <QtQuickControls2Impl/private/qquickiconlabel_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickIconImage;
+class QQuickMnemonicLabel;
+
+class Q_AUTOTEST_EXPORT QQuickIconLabelPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
+{
+    Q_DECLARE_PUBLIC(QQuickIconLabel)
+
+public:
+    ~QQuickIconLabelPrivate() override;
+
+    bool hasIcon() const;
+    bool hasText() const;
+
+    bool createImage();
+    bool destroyImage();
+    bool updateImage();
+    void syncImage();
+    void updateOrSyncImage();
+
+    bool createLabel();
+    bool destroyLabel();
+    bool updateLabel();
+    void syncLabel();
+    void updateOrSyncLabel();
+
+    void updateImplicitSize();
+    void layout();
+
+    void watchChanges(QQuickItem *item);
+    void unwatchChanges(QQuickItem *item);
+    void setPositioningDirty();
+
+    bool isLeftToRight() const;
+
+    void itemImplicitWidthChanged(QQuickItem *) override;
+    void itemImplicitHeightChanged(QQuickItem *) override;
+    void itemDestroyed(QQuickItem *item) override;
+
+    bool mirrored = false;
+    QQuickIconLabel::Display display = QQuickIconLabel::TextBesideIcon;
+    Qt::Alignment alignment = Qt::AlignCenter;
+    qreal spacing = 0;
+    qreal topPadding = 0;
+    qreal leftPadding = 0;
+    qreal rightPadding = 0;
+    qreal bottomPadding = 0;
+    QFont font;
+    QColor color;
+    QString text;
+    QQuickIcon icon;
+    QQuickIconImage *image = nullptr;
+    QQuickMnemonicLabel *label = nullptr;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKICONLABEL_P_P_H