From 56f40cdca6b589beec5c2cb803633985ca4c59d1 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Tue, 9 Jun 2020 14:00:13 +0200 Subject: Remove the openglextensions module [ChangeLog][General] The QtOpenglExtensions module has been discontinued. It provided only convenience functionality for certain direct OpenGL usage. With the new RHI graphics API abstraction, that is no longer a primary use case. Applications that still need to access that API have a number of alternative options, including QOpenGLExtraFunctions. Fixes: QTBUG-84085 Change-Id: I272af61c69ebcec207b576d67d08b59623d485ec Reviewed-by: Laszlo Agocs --- tests/auto/cmake/CMakeLists.txt | 1 - tests/auto/cmake/cmake.pro | 1 - .../test_openglextensions_module/CMakeLists.txt | 22 ----------- .../cmake/test_openglextensions_module/main.cpp | 43 ---------------------- 4 files changed, 67 deletions(-) delete mode 100644 tests/auto/cmake/test_openglextensions_module/CMakeLists.txt delete mode 100644 tests/auto/cmake/test_openglextensions_module/main.cpp (limited to 'tests/auto/cmake') diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index ac9c1d5197..d8103d37f0 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -133,7 +133,6 @@ test_module_includes( ${qt_module_includes} ) expect_pass(test_concurrent_module) -expect_pass(test_openglextensions_module) if (QT_WITH_ANGLE OR (NOT WIN32 AND NOT APPLE AND NOT NO_EGL)) expect_pass(test_egl_lib) endif() diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index 06509f4ad3..35dbf613d9 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -11,7 +11,6 @@ CMAKE_QT_MODULES_UNDER_TEST = core network xml sql testlib qtHaveModule(dbus): CMAKE_QT_MODULES_UNDER_TEST += dbus qtHaveModule(gui): CMAKE_QT_MODULES_UNDER_TEST += gui -qtHaveModule(openglextensions): CMAKE_QT_MODULES_UNDER_TEST += openglextensions qtHaveModule(widgets): CMAKE_QT_MODULES_UNDER_TEST += widgets qtHaveModule(printsupport): CMAKE_QT_MODULES_UNDER_TEST += printsupport qtHaveModule(opengl): CMAKE_QT_MODULES_UNDER_TEST += opengl diff --git a/tests/auto/cmake/test_openglextensions_module/CMakeLists.txt b/tests/auto/cmake/test_openglextensions_module/CMakeLists.txt deleted file mode 100644 index 3c23bce2bd..0000000000 --- a/tests/auto/cmake/test_openglextensions_module/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(test_openglextensions_module) - -find_package(Qt5OpenGLExtensions 5.1.0 REQUIRED) - -include_directories( - ${Qt5OpenGLExtensions_INCLUDE_DIRS} -) - -add_definitions( - ${Qt5OpenGLExtensions_DEFINITIONS} -) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5OpenGLExtensions_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(mainapp main.cpp) - -target_link_libraries(mainapp - ${Qt5OpenGLExtensions_LIBRARIES} -) diff --git a/tests/auto/cmake/test_openglextensions_module/main.cpp b/tests/auto/cmake/test_openglextensions_module/main.cpp deleted file mode 100644 index ddaadc0791..0000000000 --- a/tests/auto/cmake/test_openglextensions_module/main.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 -#include -#include -#include - -int main(int argc, char **argv) -{ -#if QT_CONFIG(opengles2) - QOpenGLExtension_OES_vertex_array_object obj; -#else - QOpenGLExtension_ARB_draw_buffers obj; -#endif - - return 0; -} -- cgit v1.2.3