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

diff --git a/tests/auto/quickcontrols/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml b/tests/auto/quickcontrols/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
new file mode 100644
index 0000000000..1db3e351bc
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
@@ -0,0 +1,50 @@
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+import QtQuick
+import QtQuick.Controls
+
+ApplicationWindow {
+    width: 640
+    height: 480
+
+    property alias menuButton: menuButton
+    property alias menu: menu
+
+    signal menuButtonClicked
+
+    Button {
+        id: menuButton
+        text: "Open menu"
+
+        // Buttons do not emit clicked() for enter/return, hence the Keys usage.
+        // The signal is just for the test to ensure that the return was actually handled.
+        Keys.onReturnPressed: {
+            menuButtonClicked()
+            menu.open()
+        }
+    }
+
+    Menu {
+        id: menu
+        parent: menuButton
+
+        onOpened: command1.forceActiveFocus()
+
+        MenuItem {
+            id: command1
+            objectName: text
+            text: "Command 1"
+        }
+
+        MenuItem {
+            objectName: text
+            text: "Command 2"
+        }
+
+        MenuItem {
+            objectName: text
+            text: "Command 3"
+        }
+    }
+}