diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-15 19:55:20 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-17 11:59:38 +0200 |
commit | 7dab86334a6a4db80888c6305736a20d043d4a3c (patch) | |
tree | 17c4e95d1a0e93bbcc790534cbee7e3384e45931 /tests | |
parent | 24abd0d14ebd420c275fa4e49ddb1a43b441c74f (diff) |
Remove openglinfo autotest
...because OpenGLInfo itself is deprecated and was replaced by
GraphicsInfo back in Qt 5.8.
Change-Id: Icfeff14cc404d9b82da07991c77fc4a7a0869883
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquickopenglinfo/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/quick/qquickopenglinfo/CMakeLists.txt | 39 | ||||
-rw-r--r-- | tests/auto/quick/qquickopenglinfo/data/basic.qml | 8 | ||||
-rw-r--r-- | tests/auto/quick/qquickopenglinfo/qquickopenglinfo.pro | 14 | ||||
-rw-r--r-- | tests/auto/quick/qquickopenglinfo/tst_qquickopenglinfo.cpp | 72 | ||||
-rw-r--r-- | tests/auto/quick/quick.pro | 1 |
6 files changed, 0 insertions, 137 deletions
diff --git a/tests/auto/quick/qquickopenglinfo/BLACKLIST b/tests/auto/quick/qquickopenglinfo/BLACKLIST deleted file mode 100644 index 7ac31e1cd0..0000000000 --- a/tests/auto/quick/qquickopenglinfo/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-65615 -[testProperties] -b2qt diff --git a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt deleted file mode 100644 index ba483df856..0000000000 --- a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Generated from qquickopenglinfo.pro. - -##################################################################### -## tst_qquickopenglinfo Test: -##################################################################### - -# Collect test data -file(GLOB_RECURSE test_data_glob - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - data/*) -list(APPEND test_data ${test_data_glob}) - -qt_add_test(tst_qquickopenglinfo - SOURCES - ../../shared/util.cpp ../../shared/util.h - tst_qquickopenglinfo.cpp - INCLUDE_DIRECTORIES - ../../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::Quick - TESTDATA ${test_data} -) - -#### Keys ignored in scope 1:.:.:qquickopenglinfo.pro:<TRUE>: -# OTHER_FILES = "data/basic.qml" - -## Scopes: -##################################################################### - -qt_extend_target(tst_qquickopenglinfo CONDITION ANDROID OR IOS - DEFINES - QT_QMLTEST_DATADIR=\\\":/data\\\" -) - -qt_extend_target(tst_qquickopenglinfo CONDITION NOT ANDROID AND NOT IOS - DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" -) diff --git a/tests/auto/quick/qquickopenglinfo/data/basic.qml b/tests/auto/quick/qquickopenglinfo/data/basic.qml deleted file mode 100644 index b48447941b..0000000000 --- a/tests/auto/quick/qquickopenglinfo/data/basic.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.4 - -Item { - property int majorVersion: OpenGLInfo.majorVersion - property int minorVersion: OpenGLInfo.minorVersion - property int profile: OpenGLInfo.profile - property int renderableType: OpenGLInfo.renderableType -} diff --git a/tests/auto/quick/qquickopenglinfo/qquickopenglinfo.pro b/tests/auto/quick/qquickopenglinfo/qquickopenglinfo.pro deleted file mode 100644 index 650ec04029..0000000000 --- a/tests/auto/quick/qquickopenglinfo/qquickopenglinfo.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickopenglinfo -SOURCES += tst_qquickopenglinfo.cpp - -TESTDATA = data/* -include(../../shared/util.pri) - -osx:CONFIG -= app_bundle - -QT += quick testlib - -OTHER_FILES += \ - data/basic.qml - diff --git a/tests/auto/quick/qquickopenglinfo/tst_qquickopenglinfo.cpp b/tests/auto/quick/qquickopenglinfo/tst_qquickopenglinfo.cpp deleted file mode 100644 index a4cbaa453d..0000000000 --- a/tests/auto/quick/qquickopenglinfo/tst_qquickopenglinfo.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 BlackBerry 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$ -** -****************************************************************************/ - -#include <QtTest/qtest.h> -#include <QtTest/qsignalspy.h> - -#include <QtQuick/qquickitem.h> -#include <QtQuick/qquickview.h> - -#include <qopenglcontext.h> -#include <QtGui/qsurfaceformat.h> - -#include "../../shared/util.h" - -class tst_QQuickOpenGLInfo : public QQmlDataTest -{ - Q_OBJECT - -private slots: - void testProperties(); -}; - -void tst_QQuickOpenGLInfo::testProperties() -{ - QQuickView view; - view.setSource(testFileUrl("basic.qml")); - - view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); - - QSignalSpy spy(&view, SIGNAL(sceneGraphInitialized())); - spy.wait(); - - QVERIFY(view.openglContext()); - QSurfaceFormat format = view.openglContext()->format(); - - QObject* obj = view.rootObject(); - QVERIFY(obj); - QCOMPARE(obj->property("majorVersion").toInt(), format.majorVersion()); - QCOMPARE(obj->property("minorVersion").toInt(), format.minorVersion()); - QCOMPARE(obj->property("profile").toInt(), static_cast<int>(format.profile())); - QCOMPARE(obj->property("renderableType").toInt(), static_cast<int>(format.renderableType())); -} - -QTEST_MAIN(tst_QQuickOpenGLInfo) - -#include "tst_qquickopenglinfo.moc" diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index da119c8b27..fada4a0d31 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -13,7 +13,6 @@ qtConfig(opengl(es1|es2)?) { QUICKTESTS += \ qquickanimatedsprite \ qquickframebufferobject \ - qquickopenglinfo \ qquickspritesequence qtHaveModule(opengl): QUICKTESTS += qquickrendercontrol |