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 <[email protected]>

1 files changed, 122 insertions, 0 deletions

diff --git a/src/quicktemplates/qquicktooltip_p.h b/src/quicktemplates/qquicktooltip_p.h
new file mode 100644
index 0000000000..979df38a31
--- /dev/null
+++ b/src/quicktemplates/qquicktooltip_p.h
@@ -0,0 +1,122 @@
+// 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 QQUICKTOOLTIP_P_H
+#define QQUICKTOOLTIP_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 <QtQuickTemplates2/private/qquickpopup_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickToolTipPrivate;
+class QQuickToolTipAttached;
+class QQuickToolTipAttachedPrivate;
+
+class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolTip : public QQuickPopup
+{
+    Q_OBJECT
+    Q_PROPERTY(int delay READ delay WRITE setDelay NOTIFY delayChanged FINAL)
+    Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged FINAL)
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
+    QML_NAMED_ELEMENT(ToolTip)
+    QML_ATTACHED(QQuickToolTipAttached)
+    QML_ADDED_IN_VERSION(2, 0)
+
+public:
+    explicit QQuickToolTip(QQuickItem *parent = nullptr);
+
+    QString text() const;
+    void setText(const QString &text);
+
+    int delay() const;
+    void setDelay(int delay);
+
+    int timeout() const;
+    void setTimeout(int timeout);
+
+    void setVisible(bool visible) override;
+
+    static QQuickToolTipAttached *qmlAttachedProperties(QObject *object);
+
+Q_SIGNALS:
+    void textChanged();
+    void delayChanged();
+    void timeoutChanged();
+
+public Q_SLOTS:
+    Q_REVISION(2, 5) void show(const QString &text, int ms = -1);
+    Q_REVISION(2, 5) void hide();
+
+protected:
+    QFont defaultFont() const override;
+
+    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override;
+    void timerEvent(QTimerEvent *event) override;
+
+#if QT_CONFIG(accessibility)
+    QAccessible::Role accessibleRole() const override;
+    void accessibilityActiveChanged(bool active) override;
+#endif
+
+private:
+    Q_DISABLE_COPY(QQuickToolTip)
+    Q_DECLARE_PRIVATE(QQuickToolTip)
+};
+
+class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolTipAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
+    Q_PROPERTY(int delay READ delay WRITE setDelay NOTIFY delayChanged FINAL)
+    Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged FINAL)
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
+    Q_PROPERTY(QQuickToolTip *toolTip READ toolTip CONSTANT FINAL)
+
+public:
+    explicit QQuickToolTipAttached(QObject *parent = nullptr);
+
+    QString text() const;
+    void setText(const QString &text);
+
+    int delay() const;
+    void setDelay(int delay);
+
+    int timeout() const;
+    void setTimeout(int timeout);
+
+    bool isVisible() const;
+    void setVisible(bool visible);
+
+    QQuickToolTip *toolTip() const;
+
+Q_SIGNALS:
+    void textChanged();
+    void delayChanged();
+    void timeoutChanged();
+    void visibleChanged();
+
+public Q_SLOTS:
+    void show(const QString &text, int ms = -1);
+    void hide();
+
+private:
+    Q_DISABLE_COPY(QQuickToolTipAttached)
+    Q_DECLARE_PRIVATE(QQuickToolTipAttached)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QQuickToolTip)
+
+#endif // QQUICKTOOLTIP_P_H