Remove qtquickcontrols2 sources and explain where they wentHEADdev

Now that qtquickcontrols2 has been merged into qtdeclarative,
we should make it obvious that this repo should no longer be
used, by preventing it from being built.

Task-number: QTBUG-95173
Pick-to: 6.2
Change-Id: I95bd6a214f3d75a865ab163ee0a1f9ffbeb7a051
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Volker Hilsheimer <[email protected]>

5 files changed, 0 insertions, 220 deletions

diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt
deleted file mode 100644
index ac4a70d3..00000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-# Generated from qquickuniversalstyleconf.pro.
-
-#####################################################################
-## tst_qquickuniversalstyleconf Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickuniversalstyleconf
-    SOURCES
-        ../shared/qtest_quickcontrols.h
-        ../shared/util.cpp ../shared/util.h
-        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
-        tst_qquickuniversalstyleconf.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-# Resources:
-set(qquickuniversalstyleconf_resource_files
-    "qtquickcontrols2.conf"
-)
-
-qt_internal_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf"
-    PREFIX
-        "/"
-    FILES
-        ${qquickuniversalstyleconf_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:qquickuniversalstyleconf.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/data/applicationwindow.qml b/tests/auto/quickcontrols2/qquickuniversalstyleconf/data/applicationwindow.qml
deleted file mode 100644
index bb16254a..00000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/data/applicationwindow.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Controls.Universal
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias label: label
-
-    Label {
-        id: label
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/qquickuniversalstyleconf.qrc b/tests/auto/quickcontrols2/qquickuniversalstyleconf/qquickuniversalstyleconf.qrc
deleted file mode 100644
index 53ba6450..00000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/qquickuniversalstyleconf.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>qtquickcontrols2.conf</file>
-</qresource>
-</RCC>
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/qtquickcontrols2.conf b/tests/auto/quickcontrols2/qquickuniversalstyleconf/qtquickcontrols2.conf
deleted file mode 100644
index 0ec13258..00000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/qtquickcontrols2.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[Controls]
-Style=Universal
-
-[Universal]
-Background=#444444
-Foreground=Red
-Font\PixelSize=22
-
-[Universal\Font]
-Family=Courier
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp b/tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
deleted file mode 100644
index bef3b1cd..00000000
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QtQuick/private/qquickitem_p.h>
-#include "../shared/util.h"
-#include "../shared/visualtestutil.h"
-
-using namespace QQuickVisualTestUtil;
-
-class tst_qquickuniversalstyleconf : public QQmlDataTest
-{
-    Q_OBJECT
-
-public:
-
-private slots:
-    void conf();
-};
-
-void tst_qquickuniversalstyleconf::conf()
-{
-    QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QFont customFont;
-    customFont.setFamilies(QStringList{QLatin1String("Courier")});
-    customFont.setPixelSize(22);
-
-    QQuickApplicationWindow *window = helper.appWindow;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-    // We specified a custom background color and font, so the window should have them.
-    QCOMPARE(window->property("color").value<QColor>(), QColor("#444444"));
-    QCOMPARE(window->property("font").value<QFont>(), customFont);
-
-    // We specified a custom foreground color and font, so the label should have them.
-    QQuickItem *label = window->property("label").value<QQuickItem*>();
-    QVERIFY(label);
-    QCOMPARE(label->property("color").value<QColor>(), QColor("#E51400"));
-    QCOMPARE(label->property("font").value<QFont>(), customFont);
-}
-
-QTEST_MAIN(tst_qquickuniversalstyleconf)
-
-#include "tst_qquickuniversalstyleconf.moc"