Move QOpenGLWidget from QtOpenGL to its own module

Same pattern as QtQuickWidgets. Gets rid of QtOpenGL's dependency on QtWidgets.

Task-number: QTBUG-74409
Change-Id: I4f9b55c23e25a1e0519734037b768a16e870c7d2
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

15 files changed, 21 insertions, 7 deletions

diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro
index 20fe4739a5..751c2022fd 100644
--- a/examples/opengl/2dpainting/2dpainting.pro
+++ b/examples/opengl/2dpainting/2dpainting.pro
@@ -1,4 +1,4 @@
-QT          += widgets opengl
+QT += widgets opengl openglwidgets
 
 HEADERS     = glwidget.h \
               helper.h \
diff --git a/examples/opengl/2dpainting/CMakeLists.txt b/examples/opengl/2dpainting/CMakeLists.txt
index 1144830659..31f8005a19 100644
--- a/examples/opengl/2dpainting/CMakeLists.txt
+++ b/examples/opengl/2dpainting/CMakeLists.txt
@@ -15,6 +15,7 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
 
 add_qt_gui_executable(2dpainting
     glwidget.cpp glwidget.h
@@ -27,6 +28,7 @@ target_link_libraries(2dpainting PUBLIC
     Qt::Core
     Qt::Gui
     Qt::OpenGL
+    Qt::OpenGLWidgets
     Qt::Widgets
 )
 
diff --git a/examples/opengl/cube/CMakeLists.txt b/examples/opengl/cube/CMakeLists.txt
index cb7c78080e..2d0d0f7887 100644
--- a/examples/opengl/cube/CMakeLists.txt
+++ b/examples/opengl/cube/CMakeLists.txt
@@ -15,6 +15,7 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
 
 add_qt_gui_executable(cube
     geometryengine.cpp geometryengine.h
@@ -25,6 +26,7 @@ target_link_libraries(cube PUBLIC
     Qt::Core
     Qt::Gui
     Qt::OpenGL
+    Qt::OpenGLWidgets
     Qt::Widgets
 )
 
diff --git a/examples/opengl/cube/cube.pro b/examples/opengl/cube/cube.pro
index 07724e247e..95a411322a 100644
--- a/examples/opengl/cube/cube.pro
+++ b/examples/opengl/cube/cube.pro
@@ -1,4 +1,4 @@
-QT       += core gui widgets opengl
+QT += core gui widgets opengl openglwidgets
 
 TARGET = cube
 TEMPLATE = app
diff --git a/examples/opengl/hellogl2/CMakeLists.txt b/examples/opengl/hellogl2/CMakeLists.txt
index 5df3c811e5..798a83594e 100644
--- a/examples/opengl/hellogl2/CMakeLists.txt
+++ b/examples/opengl/hellogl2/CMakeLists.txt
@@ -15,6 +15,7 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
 
 add_qt_gui_executable(hellogl2
     glwidget.cpp glwidget.h
@@ -27,6 +28,7 @@ target_link_libraries(hellogl2 PUBLIC
     Qt::Core
     Qt::Gui
     Qt::OpenGL
+    Qt::OpenGLWidgets
     Qt::Widgets
 )
 
diff --git a/examples/opengl/hellogl2/hellogl2.pro b/examples/opengl/hellogl2/hellogl2.pro
index 834ae82e1f..d7cd38de53 100644
--- a/examples/opengl/hellogl2/hellogl2.pro
+++ b/examples/opengl/hellogl2/hellogl2.pro
@@ -8,7 +8,7 @@ SOURCES       = glwidget.cpp \
                 mainwindow.cpp \
                 logo.cpp
 
-QT           += widgets opengl
+QT += widgets opengl openglwidgets
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl2
diff --git a/examples/opengl/qopenglwidget/CMakeLists.txt b/examples/opengl/qopenglwidget/CMakeLists.txt
index 586bd7130a..10b30f9461 100644
--- a/examples/opengl/qopenglwidget/CMakeLists.txt
+++ b/examples/opengl/qopenglwidget/CMakeLists.txt
@@ -15,6 +15,7 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
 
 add_qt_gui_executable(qopenglwidget
     bubble.cpp bubble.h
@@ -26,6 +27,7 @@ target_link_libraries(qopenglwidget PUBLIC
     Qt::Core
     Qt::Gui
     Qt::OpenGL
+    Qt::OpenGLWidgets
     Qt::Widgets
 )
 
diff --git a/examples/opengl/qopenglwidget/qopenglwidget.pro b/examples/opengl/qopenglwidget/qopenglwidget.pro
index 1df3de1290..7ac546d7ce 100644
--- a/examples/opengl/qopenglwidget/qopenglwidget.pro
+++ b/examples/opengl/qopenglwidget/qopenglwidget.pro
@@ -1,4 +1,4 @@
-QT += widgets opengl
+QT += widgets opengl openglwidgets
 
 SOURCES += main.cpp \
            glwidget.cpp \
diff --git a/examples/opengl/textures/CMakeLists.txt b/examples/opengl/textures/CMakeLists.txt
index 8e4f7788e1..1bb4ae6240 100644
--- a/examples/opengl/textures/CMakeLists.txt
+++ b/examples/opengl/textures/CMakeLists.txt
@@ -15,6 +15,7 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
 
 add_qt_gui_executable(textures
     glwidget.cpp glwidget.h
@@ -25,6 +26,7 @@ target_link_libraries(textures PUBLIC
     Qt::Core
     Qt::Gui
     Qt::OpenGL
+    Qt::OpenGLWidgets
     Qt::Widgets
 )
 
diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro
index ae1ae4d34c..d2a6506cb8 100644
--- a/examples/opengl/textures/textures.pro
+++ b/examples/opengl/textures/textures.pro
@@ -6,7 +6,7 @@ SOURCES       = glwidget.cpp \
 
 RESOURCES     = textures.qrc
 
-QT           += widgets opengl
+QT += widgets opengl openglwidgets
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures
diff --git a/examples/opengl/threadedqopenglwidget/CMakeLists.txt b/examples/opengl/threadedqopenglwidget/CMakeLists.txt
index a295c63f71..f5368f89ef 100644
--- a/examples/opengl/threadedqopenglwidget/CMakeLists.txt
+++ b/examples/opengl/threadedqopenglwidget/CMakeLists.txt
@@ -15,6 +15,7 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
 
 add_qt_gui_executable(threadedqopenglwidget
     glwidget.cpp glwidget.h
@@ -25,6 +26,7 @@ target_link_libraries(threadedqopenglwidget PUBLIC
     Qt::Core
     Qt::Gui
     Qt::OpenGL
+    Qt::OpenGLWidgets
     Qt::Widgets
 )
 
diff --git a/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro b/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
index 70694459b2..a62fbeb9c2 100644
--- a/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
+++ b/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
@@ -1,4 +1,4 @@
-QT += widgets opengl
+QT += widgets opengl openglwidgets
 
 SOURCES += main.cpp \
            glwidget.cpp \
diff --git a/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt
index 748e1e27f3..6514f07a5a 100644
--- a/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt
+++ b/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt
@@ -53,6 +53,7 @@ qt6_add_resources(padnavigator "padnavigator"
 if(TARGET Qt::OpenGL)
     target_link_libraries(padnavigator PUBLIC
         Qt::OpenGL
+        Qt::OpenGLWidgets
     )
 endif()
 
diff --git a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
index 7231066b72..a84d3f08d1 100644
--- a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
+++ b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
@@ -54,6 +54,7 @@ qt6_add_resources(padnavigator "padnavigator"
 if(TARGET Qt::OpenGL)
     target_link_libraries(padnavigator PUBLIC
         Qt::OpenGL
+        Qt::OpenGLWidgets
     )
 endif()
 
diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.pro b/examples/widgets/graphicsview/padnavigator/padnavigator.pro
index 53a57c85d7..d957be4593 100644
--- a/examples/widgets/graphicsview/padnavigator/padnavigator.pro
+++ b/examples/widgets/graphicsview/padnavigator/padnavigator.pro
@@ -18,7 +18,7 @@ FORMS += \
 
 QT += widgets
 requires(qtConfig(treewidget))
-qtHaveModule(opengl): QT += opengl
+qtHaveModule(opengl): QT += opengl openglwidgets
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/padnavigator