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

diff --git a/tests/auto/quickcontrols/qquickcontrol/tst_qquickcontrol.cpp b/tests/auto/quickcontrols/qquickcontrol/tst_qquickcontrol.cpp
new file mode 100644
index 0000000000..ddb4b7ff8b
--- /dev/null
+++ b/tests/auto/quickcontrols/qquickcontrol/tst_qquickcontrol.cpp
@@ -0,0 +1,111 @@
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <QtTest/qtest.h>
+#include <QtTest/qsignalspy.h>
+#include <QtGui/qpa/qwindowsysteminterface.h>
+#include <QtQuickTestUtils/private/qmlutils_p.h>
+#include <QtQuickTestUtils/private/visualtestutils_p.h>
+#include <QtQuickTemplates2/private/qquickbutton_p.h>
+#include <QtQuickControlsTestUtils/private/qtest_quickcontrols_p.h>
+#include <QtQuick/private/qquicktext_p_p.h>
+
+using namespace QQuickVisualTestUtils;
+
+class tst_QQuickControl : public QQmlDataTest
+{
+    Q_OBJECT
+
+public:
+    tst_QQuickControl();
+
+private slots:
+    void initTestCase() override;
+    void flickable();
+    void fractionalFontSize();
+    void resizeBackgroundKeepsBindings();
+
+private:
+    QScopedPointer<QPointingDevice> touchDevice;
+};
+
+tst_QQuickControl::tst_QQuickControl()
+    : QQmlDataTest(QT_QMLTEST_DATADIR)
+{
+}
+
+void tst_QQuickControl::initTestCase()
+{
+    QQmlDataTest::initTestCase();
+    qputenv("QML_NO_TOUCH_COMPRESSION", "1");
+
+    touchDevice.reset(QTest::createTouchDevice());
+}
+
+void tst_QQuickControl::flickable()
+{
+    // Check that when a Button that is inside a Flickable with a pressDelay
+    // still gets the released and clicked signals sent due to the fact that
+    // Flickable sends a mouse event for the delay and not a touch event
+    QQuickApplicationHelper helper(this, QStringLiteral("flickable.qml"));
+    QQuickWindow *window = helper.window;
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+
+    QQuickButton *button = window->property("button").value<QQuickButton *>();
+    QVERIFY(button);
+
+    QSignalSpy buttonPressedSpy(button, SIGNAL(pressed()));
+    QVERIFY(buttonPressedSpy.isValid());
+
+    QSignalSpy buttonReleasedSpy(button, SIGNAL(released()));
+    QVERIFY(buttonReleasedSpy.isValid());
+
+    QSignalSpy buttonClickedSpy(button, SIGNAL(clicked()));
+    QVERIFY(buttonClickedSpy.isValid());
+
+    QPoint p(button->width() / 2, button->height() / 2);
+    QTest::touchEvent(window, touchDevice.data()).press(0, p);
+    QTRY_COMPARE(buttonPressedSpy.size(), 1);
+    p += QPoint(1, 1); // less than the drag threshold
+    QTest::touchEvent(window, touchDevice.data()).move(0, p);
+    QTest::touchEvent(window, touchDevice.data()).release(0, p);
+    QTRY_COMPARE(buttonReleasedSpy.size(), 1);
+    QTRY_COMPARE(buttonClickedSpy.size(), 1);
+}
+
+void tst_QQuickControl::fractionalFontSize()
+{
+    QQuickApplicationHelper helper(this, QStringLiteral("fractionalFontSize.qml"));
+    QQuickWindow *window = helper.window;
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+    const QQuickControl *control = window->property("control").value<QQuickControl *>();
+    QVERIFY(control);
+    QQuickText *contentItem = qobject_cast<QQuickText *>(control->contentItem());
+    QVERIFY(contentItem);
+
+    QVERIFY(!contentItem->truncated());
+
+    QVERIFY2(qFuzzyCompare(contentItem->contentWidth(),
+            QQuickTextPrivate::get(contentItem)->layout.boundingRect().width()),
+            "The QQuickText::contentWidth() doesn't match the layout's preferred text width");
+}
+
+void tst_QQuickControl::resizeBackgroundKeepsBindings()
+{
+    QQuickApplicationHelper helper(this, QStringLiteral("resizeBackgroundKeepsBindings.qml"));
+    QQuickWindow *window = helper.window;
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+    auto ctxt = qmlContext(window);
+    QVERIFY(ctxt);
+    auto background = qobject_cast<QQuickItem *>(ctxt->objectForName("background"));
+    QVERIFY(background);
+    QCOMPARE(background->height(), 4);
+    QVERIFY(background->bindableHeight().hasBinding());
+}
+
+QTEST_QUICKCONTROLS_MAIN(tst_QQuickControl)
+
+#include "tst_qquickcontrol.moc"