From 4b611d649ede3bd1e56a73abcbd16aa60db38e3b Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Fri, 17 Jan 2020 14:40:36 +0100
Subject: Move QOpenGLShaderProgram from QtGui to QtOpenGL

Task-number: QTBUG-74409
Change-Id: I20dfafc0c9bf8e2b68b03e171d70c2cb4ad2bfaf
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 examples/opengl/contextinfo/CMakeLists.txt    | 2 ++
 examples/opengl/contextinfo/contextinfo.pro   | 2 +-
 examples/opengl/contextinfo/renderwindow.cpp  | 2 +-
 examples/opengl/hellowindow/CMakeLists.txt    | 2 ++
 examples/opengl/hellowindow/hellowindow.h     | 2 +-
 examples/opengl/hellowindow/hellowindow.pro   | 2 +-
 examples/opengl/paintedwindow/paintedwindow.h | 2 +-
 7 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'examples/opengl')

diff --git a/examples/opengl/contextinfo/CMakeLists.txt b/examples/opengl/contextinfo/CMakeLists.txt
index d174946ad6..124dfd4b52 100644
--- a/examples/opengl/contextinfo/CMakeLists.txt
+++ b/examples/opengl/contextinfo/CMakeLists.txt
@@ -14,6 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples/opengl/contextinfo")
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(contextinfo
     main.cpp
@@ -23,6 +24,7 @@ add_qt_gui_executable(contextinfo
 target_link_libraries(contextinfo PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
     Qt::Widgets
 )
 
diff --git a/examples/opengl/contextinfo/contextinfo.pro b/examples/opengl/contextinfo/contextinfo.pro
index 3d948dd282..ae8f4067b6 100644
--- a/examples/opengl/contextinfo/contextinfo.pro
+++ b/examples/opengl/contextinfo/contextinfo.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-QT += widgets
+QT += widgets opengl
 requires(qtConfig(filedialog))
 
 SOURCES += main.cpp \
diff --git a/examples/opengl/contextinfo/renderwindow.cpp b/examples/opengl/contextinfo/renderwindow.cpp
index ea9a7a24cb..b778fd1d89 100644
--- a/examples/opengl/contextinfo/renderwindow.cpp
+++ b/examples/opengl/contextinfo/renderwindow.cpp
@@ -52,7 +52,7 @@
 #include <QTimer>
 #include <QMatrix4x4>
 #include <QOpenGLContext>
-#include <QOpenGLShaderProgram>
+#include <QtOpenGL/QOpenGLShaderProgram>
 #include <QOpenGLFunctions>
 
 RenderWindow::RenderWindow(const QSurfaceFormat &format)
diff --git a/examples/opengl/hellowindow/CMakeLists.txt b/examples/opengl/hellowindow/CMakeLists.txt
index 58bd3fc362..876c282fbe 100644
--- a/examples/opengl/hellowindow/CMakeLists.txt
+++ b/examples/opengl/hellowindow/CMakeLists.txt
@@ -13,6 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples/opengl/hellowindow")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(hellowindow
     hellowindow.cpp hellowindow.h
@@ -23,6 +24,7 @@ target_link_libraries(hellowindow PUBLIC
     Qt::CorePrivate
     Qt::Gui
     Qt::GuiPrivate
+    Qt::OpenGL
 )
 
 install(TARGETS hellowindow
diff --git a/examples/opengl/hellowindow/hellowindow.h b/examples/opengl/hellowindow/hellowindow.h
index e6d7970cfc..938c6409a4 100644
--- a/examples/opengl/hellowindow/hellowindow.h
+++ b/examples/opengl/hellowindow/hellowindow.h
@@ -52,7 +52,7 @@
 
 #include <QColor>
 #include <QMutex>
-#include <QOpenGLShaderProgram>
+#include <QtOpenGL/QOpenGLShaderProgram>
 #include <QOpenGLBuffer>
 #include <QSharedPointer>
 #include <QTimer>
diff --git a/examples/opengl/hellowindow/hellowindow.pro b/examples/opengl/hellowindow/hellowindow.pro
index cc220fd344..27c274a378 100644
--- a/examples/opengl/hellowindow/hellowindow.pro
+++ b/examples/opengl/hellowindow/hellowindow.pro
@@ -1,4 +1,4 @@
-QT += gui-private core-private
+QT += gui-private core-private opengl
 
 HEADERS += hellowindow.h
 SOURCES += hellowindow.cpp main.cpp
diff --git a/examples/opengl/paintedwindow/paintedwindow.h b/examples/opengl/paintedwindow/paintedwindow.h
index 0dace49a33..972d8d10bd 100644
--- a/examples/opengl/paintedwindow/paintedwindow.h
+++ b/examples/opengl/paintedwindow/paintedwindow.h
@@ -51,7 +51,7 @@
 #include <QWindow>
 
 #include <QtGui/qopengl.h>
-#include <QtGui/qopenglshaderprogram.h>
+#include <QtOpenGL/qopenglshaderprogram.h>
 #include <QtOpenGL/qopenglframebufferobject.h>
 
 #include <QPropertyAnimation>
-- 
cgit v1.2.3