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

diff --git a/src/quicktemplates/qquickaction_p_p.h b/src/quicktemplates/qquickaction_p_p.h
new file mode 100644
index 0000000000..8bee904220
--- /dev/null
+++ b/src/quicktemplates/qquickaction_p_p.h
@@ -0,0 +1,102 @@
+// 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 QQUICKACTION_P_P_H
+#define QQUICKACTION_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 <QtCore/private/qobject_p.h>
+#include <QtCore/qvariant.h>
+#include <QtCore/qstring.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/qkeysequence.h>
+#endif
+#include <QtQuick/private/qquickitemchangelistener_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QShortcutEvent;
+class QQuickActionGroup;
+
+class QQuickActionPrivate : public QObjectPrivate, public QQuickItemChangeListener
+{
+    Q_DECLARE_PUBLIC(QQuickAction)
+
+public:
+    static QQuickActionPrivate *get(QQuickAction *action)
+    {
+        return action->d_func();
+    }
+
+#if QT_CONFIG(shortcut)
+    QVariant shortcut() const;
+    void setShortcut(const QVariant &shortcut);
+#endif
+
+    void setEnabled(bool enable);
+
+    bool watchItem(QQuickItem *item);
+    bool unwatchItem(QQuickItem *item);
+
+    void registerItem(QQuickItem *item);
+    void unregisterItem(QQuickItem *item);
+
+    void itemVisibilityChanged(QQuickItem *item) override;
+    void itemDestroyed(QQuickItem *item) override;
+
+    bool handleShortcutEvent(QObject *object, QShortcutEvent *event);
+
+    void trigger(QObject*, bool doToggle);
+
+#if QT_CONFIG(shortcut)
+    class ShortcutEntry
+    {
+    public:
+        explicit ShortcutEntry(QObject *target);
+        ~ShortcutEntry();
+
+        QObject *target() const;
+        int shortcutId() const;
+
+        void grab(const QKeySequence &vshortcut, bool enabled);
+        void ungrab();
+
+        void setEnabled(bool enabled);
+
+    private:
+        int m_shortcutId = 0;
+        QObject *m_target = nullptr;
+    };
+
+    ShortcutEntry *findShortcutEntry(QObject *target) const;
+    void updateDefaultShortcutEntry();
+#endif // QT_CONFIG(shortcut)
+
+    bool explicitEnabled = false;
+    bool enabled = true;
+    bool checked = false;
+    bool checkable = false;
+    QString text;
+    QQuickIcon icon;
+#if QT_CONFIG(shortcut)
+    QKeySequence keySequence;
+    QVariant vshortcut;
+    ShortcutEntry *defaultShortcutEntry = nullptr;
+    QList<ShortcutEntry *> shortcutEntries;
+#endif
+    QQuickActionGroup *group = nullptr;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKACTION_P_P_H