From f5a94900e8bd3b81c359cedcf5b62ec7a6f35c12 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 19 May 2021 13:53:32 +0200 Subject: Remove tst_pixel Future patches will add uses of pixel() and other accessors to selftests/tst_grabImage.qml, and that's where those kinds of tests should be. Task-number: QTBUG-27671 Change-Id: I3ad42ded144cb7fa8b196a3ac58abcd9ee9b2abf Reviewed-by: Fabian Kosmale Reviewed-by: Alexander Akulich (cherry picked from commit 1d1910e70778114e5eae586792664cf6c0997ed0) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/qmltest/CMakeLists.txt | 1 - tests/auto/qmltest/pixel/CMakeLists.txt | 12 ------ tests/auto/qmltest/pixel/tst_pixel.qml | 65 --------------------------------- 3 files changed, 78 deletions(-) delete mode 100644 tests/auto/qmltest/pixel/CMakeLists.txt delete mode 100644 tests/auto/qmltest/pixel/tst_pixel.qml (limited to 'tests/auto') diff --git a/tests/auto/qmltest/CMakeLists.txt b/tests/auto/qmltest/CMakeLists.txt index fe402859a4..33f7c004c8 100644 --- a/tests/auto/qmltest/CMakeLists.txt +++ b/tests/auto/qmltest/CMakeLists.txt @@ -16,7 +16,6 @@ add_subdirectory(listmodel) add_subdirectory(listview) add_subdirectory(objectmodel) add_subdirectory(pathview) -add_subdirectory(pixel) add_subdirectory(positioners) add_subdirectory(qqmlbinding) add_subdirectory(qtbug46798) diff --git a/tests/auto/qmltest/pixel/CMakeLists.txt b/tests/auto/qmltest/pixel/CMakeLists.txt deleted file mode 100644 index 8ba8a1b2d3..0000000000 --- a/tests/auto/qmltest/pixel/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Generated from pixel.pro. - -##################################################################### -## pixel Test: -##################################################################### - -qt_internal_add_test(pixel - GUI - QMLTEST - PUBLIC_LIBRARIES - Qt::Gui -) diff --git a/tests/auto/qmltest/pixel/tst_pixel.qml b/tests/auto/qmltest/pixel/tst_pixel.qml deleted file mode 100644 index e628fed1d8..0000000000 --- a/tests/auto/qmltest/pixel/tst_pixel.qml +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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:GPL-EXCEPT$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtTest 1.1 - -Rectangle { - id:rect - width: 40 - height: 40 - color:"red" - TestCase { - name: "Pixels" - when: windowShown - - function test_pixel() { - skip("test_pixel() is unstable, QTBUG-27671") - var img = grabImage(rect); - compare(img.pixel(20, 20), Qt.rgba(255, 0, 0, 255)); - compare(img.red(1,1), 255); - compare(img.green(1,1), 0); - compare(img.blue(1,1), 0); - compare(img.alpha(1,1), 255); - - fuzzyCompare(img.red(1,1), 254, 2); - fuzzyCompare(img.pixel(1,1), Qt.rgba(254, 0, 0, 254), 2); - fuzzyCompare(img.pixel(1,1), "#FF0201", 2); - - rect.color = "blue"; - waitForRendering(rect); - img = grabImage(rect); - compare(img.pixel(20, 20), Qt.rgba(0, 0, 255, 255)); - compare(img.red(1,1), 0); - compare(img.green(1,1), 0); - compare(img.blue(1,1), 255); - compare(img.alpha(1,1), 255); - } - - } -} \ No newline at end of file -- cgit v1.2.3