diff options
author | Mitch Curtis <[email protected]> | 2021-08-12 14:39:51 +0200 |
---|---|---|
committer | Mitch Curtis <[email protected]> | 2021-08-16 12:52:59 +0200 |
commit | 809339d1484cf556512534367b8170bc26baf072 (patch) | |
tree | 12871313b658f36d058b5ef25af1e247e9c46ce9 /tests/auto/quickcontrols2/controls/material | |
parent | b01b4f00eae8022c6a97d90f54dac395144ae095 (diff) |
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]>
Diffstat (limited to 'tests/auto/quickcontrols2/controls/material')
4 files changed, 0 insertions, 85 deletions
diff --git a/tests/auto/quickcontrols2/controls/material/BLACKLIST b/tests/auto/quickcontrols2/controls/material/BLACKLIST deleted file mode 100644 index 47634070..00000000 --- a/tests/auto/quickcontrols2/controls/material/BLACKLIST +++ /dev/null @@ -1,5 +0,0 @@ -# See qtbase/src/testlib/qtestblacklist.cpp for format - -# QTBUG-70597 -[Tumbler::test_itemsCorrectlyPositioned] -* diff --git a/tests/auto/quickcontrols2/controls/material/CMakeLists.txt b/tests/auto/quickcontrols2/controls/material/CMakeLists.txt deleted file mode 100644 index 7aa6c25d..00000000 --- a/tests/auto/quickcontrols2/controls/material/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -# Generated from material.pro. - -##################################################################### -## tst_material Test: -##################################################################### - -# Collect test data -file(GLOB_RECURSE test_data_glob - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) -list(APPEND test_data ${test_data_glob}) - -qt_internal_add_test(tst_material - GUI - QMLTEST - SOURCES - tst_material.cpp - DEFINES - TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data\\\" - PUBLIC_LIBRARIES - Qt::Gui - Qt::QuickControls2 - TESTDATA ${test_data} -) - -#### Keys ignored in scope 1:.:.:material.pro:<TRUE>: -# OTHER_FILES = "$$PWD/../data/*.qml" -# TEMPLATE = "app" diff --git a/tests/auto/quickcontrols2/controls/material/dependencies.qml b/tests/auto/quickcontrols2/controls/material/dependencies.qml deleted file mode 100644 index 8bcf0301..00000000 --- a/tests/auto/quickcontrols2/controls/material/dependencies.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtTest -import QtQuick -import QtQuick.Controls -import QtQuick.Controls.Material - -TestCase { } diff --git a/tests/auto/quickcontrols2/controls/material/tst_material.cpp b/tests/auto/quickcontrols2/controls/material/tst_material.cpp deleted file mode 100644 index ae8bb3a1..00000000 --- a/tests/auto/quickcontrols2/controls/material/tst_material.cpp +++ /dev/null @@ -1,46 +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 <QtQuickTest/quicktest.h> -#include <QtQuickControls2/qquickstyle.h> - -int main(int argc, char *argv[]) -{ - QTEST_SET_MAIN_SOURCE_PATH - qputenv("QML_NO_TOUCH_COMPRESSION", "1"); - QQuickStyle::setStyle("Material"); - return quick_test_main(argc, argv, "tst_controls::Material", TST_CONTROLS_DATA); -} |