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 <laszlo.agocs@qt.io>

src/CMakeLists.txt

@@ -45,7 +45,6 @@ if(QT_FEATURE_gui)
 
     if(QT_FEATURE_opengl)
         add_subdirectory(opengl)
-        add_subdirectory(openglextensions)
     endif()
 
     if(QT_FEATURE_widgets)

src/openglextensions/CMakeLists.txt

@@ -1,20 +0,0 @@
-# Generated from openglextensions.pro.
-
-#####################################################################
-## OpenGLExtensions Module:
-#####################################################################
-
-qt_add_module(OpenGLExtensions
-    STATIC
-    SOURCES
-        qopenglextensions.cpp qopenglextensions.h
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-        QT_NO_FOREACH
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-)
-
-## Scopes:
-#####################################################################

src/openglextensions/openglextensions.pro

@@ -1,15 +0,0 @@
-TARGET     = QtOpenGLExtensions
-CONFIG += static
-
-qtConfig(opengl): CONFIG += opengl
-qtConfig(opengles2): CONFIG += opengles2
-
-DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
-
-PRECOMPILED_HEADER =
-
-HEADERS = qopenglextensions.h
-
-SOURCES = qopenglextensions.cpp
-
-load(qt_module)

src/src.pro

@@ -137,10 +137,6 @@ src_openglwidgets.subdir = $$PWD/openglwidgets
 src_openglwidgets.target = sub-openglwidgets
 src_openglwidgets.depends = src_opengl src_widgets
 
-src_openglextensions.subdir = $$PWD/openglextensions
-src_openglextensions.target = sub-openglextensions
-src_openglextensions.depends = src_gui
-
 src_printsupport.subdir = $$PWD/printsupport
 src_printsupport.target = sub-printsupport
 src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic
@@ -216,7 +212,6 @@ qtConfig(gui) {
     }
     SUBDIRS += src_gui src_platformsupport src_platformheaders
     qtConfig(opengl) {
-        SUBDIRS += src_openglextensions
         SUBDIRS += src_opengl
         src_plugins.depends += src_opengl
         src_platformsupport.depends += src_opengl

sync.profile

@@ -27,7 +27,6 @@
     "QtLinuxOfonoSupport" => "$basedir/src/platformsupport/linuxofono",
     "QtPlatformHeaders" => "$basedir/src/platformheaders",
     "QtZlib" => "!>$basedir/src/corelib;$basedir/src/3rdparty/zlib",
-    "QtOpenGLExtensions" => "$basedir/src/openglextensions",
     "QtEglFSDeviceIntegration" => "$basedir/src/plugins/platforms/eglfs",
     "QtMockPlugins1" => "$basedir/tests/auto/cmake/mockplugins/mockplugins1",
     "QtMockPlugins2" => "$basedir/tests/auto/cmake/mockplugins/mockplugins2",

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()

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

tests/auto/cmake/test_openglextensions_module/CMakeLists.txt

@@ -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}
-)

tests/auto/cmake/test_openglextensions_module/main.cpp

@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
-** 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 <QtOpenGLExtensions>
-#include <QtOpenGLExtensions/QtOpenGLExtensions>
-#include <QtOpenGLExtensions/QOpenGLExtensions>
-#include <QOpenGLExtensions>
-
-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;
-}

util/glgen/README.txt

@@ -142,10 +142,6 @@ QOpenGLExtension_<name-of-extension>
 The usage pattern for OpenGL extensions is to just use a small
 number of extensions out of the large number of those available.
 
-Rather than bloat QtGui with all possible extensions, a new static library will be
+Prior to Qt 6, these classes were provided as the openglextensions
-introduced to hold these classes. That way users will only link in the code for
+module. Because of the new graphics architecture in Qt 6, that module
-the extensions that they actually use.
+has been removed.
-
-The source and header file for these classes should be moved to
-
-$QTBASE/src/openglextensions/