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>

7 files changed, 12 insertions, 9 deletions

diff --git a/tests/auto/widgets/graphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/CMakeLists.txt
index 5d6650db4a..1f638bd806 100644
--- a/tests/auto/widgets/graphicsview/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/CMakeLists.txt
@@ -1,4 +1,6 @@
-if (QT_FEATURE_private_tests)
+# Generated from graphicsview.pro.
+
+if(QT_FEATURE_private_tests)
     add_subdirectory(qgraphicsanchorlayout)
     add_subdirectory(qgraphicsanchorlayout1)
     add_subdirectory(qgraphicsitem)
@@ -15,11 +17,10 @@ add_subdirectory(qgraphicsobject)
 add_subdirectory(qgraphicspixmapitem)
 add_subdirectory(qgraphicspolygonitem)
 add_subdirectory(qgraphicstransform)
-if (NOT WINRT)
-    add_subdirectory(qgraphicsview)
-endif()
-
 if(QT_FEATURE_style_fusion)
     add_subdirectory(qgraphicsproxywidget)
     add_subdirectory(qgraphicswidget)
 endif()
+if(NOT WINRT)
+    add_subdirectory(qgraphicsview)
+endif()
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
index 17c9571d62..48064c2bf4 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
@@ -28,4 +28,5 @@ add_qt_test(tst_qgraphicsview
 extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
         Qt::OpenGL
+        Qt::OpenGLWidgets
 )
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
index e95cdcf7d8..13998d5494 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
@@ -4,7 +4,7 @@ TARGET = tst_qgraphicsview
 
 QT += widgets widgets-private testlib
 QT += core-private gui-private testlib-private
-qtConfig(opengl): QT += opengl
+qtConfig(opengl): QT += opengl openglwidgets
 
 SOURCES  += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp
 HEADERS +=  tst_qgraphicsview.h
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index bd027f9eb1..98833776cc 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -49,7 +49,7 @@
 #include <QtWidgets/QStyle>
 #include <QtWidgets/QPushButton>
 #if QT_CONFIG(opengl)
-#include <QtOpenGL/QOpenGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #endif
 #include <private/qgraphicsscene_p.h>
 #include <private/qgraphicsview_p.h>
diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
index d9e447d38b..c3fdf39fe1 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
@@ -13,5 +13,6 @@ add_qt_test(tst_qopenglwidget
         Qt::GuiPrivate
         Qt::OpenGL
         Qt::OpenGLPrivate
+        Qt::OpenGLWidgets
         Qt::Widgets
 )
diff --git a/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro b/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
index f78dc510bf..792bbf4529 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
+++ b/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
@@ -1,5 +1,5 @@
 CONFIG += testcase
 TARGET = tst_qopenglwidget
-QT += opengl opengl-private gui-private core-private testlib widgets
+QT += opengl opengl-private gui-private core-private testlib widgets openglwidgets
 
 SOURCES   += tst_qopenglwidget.cpp
diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
index e96e292525..73423d958b 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
+++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtOpenGL/QOpenGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #include <QtGui/QOpenGLFunctions>
 #include <QtGui/QPainter>
 #include <QtGui/QScreen>