11 files changed, 8 insertions, 6 deletions
diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro
index b8080c2075..275adc804d 100644
--- a/examples/gui/gui.pro
+++ b/examples/gui/gui.pro
@@ -6,5 +6,3 @@ CONFIG += no_docs_target
 
 SUBDIRS += analogclock
 SUBDIRS += rasterwindow
-qtHaveModule(gui):qtConfig(opengl): \
-    SUBDIRS += openglwindow
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
index 89b3e1d86e..74c39a1e27 100644
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -2,6 +2,7 @@ TEMPLATE      = subdirs
 
 SUBDIRS = hellowindow \
           paintedwindow \
+          openglwindow \
           qopenglwindow
 
 qtHaveModule(widgets) {
diff --git a/examples/gui/openglwindow/main.cpp b/examples/opengl/openglwindow/main.cpp
index 03a6ece06f..03a6ece06f 100644
--- a/examples/gui/openglwindow/main.cpp
+++ b/examples/opengl/openglwindow/main.cpp
diff --git a/examples/gui/openglwindow/openglwindow.cpp b/examples/opengl/openglwindow/openglwindow.cpp
index bac887dca0..bac887dca0 100644
--- a/examples/gui/openglwindow/openglwindow.cpp
+++ b/examples/opengl/openglwindow/openglwindow.cpp
diff --git a/examples/gui/openglwindow/openglwindow.h b/examples/opengl/openglwindow/openglwindow.h
index 8db943ddde..8db943ddde 100644
--- a/examples/gui/openglwindow/openglwindow.h
+++ b/examples/opengl/openglwindow/openglwindow.h
diff --git a/examples/gui/openglwindow/openglwindow.pri b/examples/opengl/openglwindow/openglwindow.pri
index 45b0b0cd29..30320df3b7 100644
--- a/examples/gui/openglwindow/openglwindow.pri
+++ b/examples/opengl/openglwindow/openglwindow.pri
@@ -1,3 +1,4 @@
+QT += opengl
 INCLUDEPATH += $$PWD
 SOURCES += $$PWD/openglwindow.cpp
 HEADERS += $$PWD/openglwindow.h
diff --git a/examples/gui/openglwindow/openglwindow.pro b/examples/opengl/openglwindow/openglwindow.pro
index 93f18f3d3f..8b1ae71c14 100644
--- a/examples/gui/openglwindow/openglwindow.pro
+++ b/examples/opengl/openglwindow/openglwindow.pro
@@ -3,5 +3,5 @@ include(openglwindow.pri)
 SOURCES += \
     main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/gui/openglwindow
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/openglwindow
 INSTALLS += target
diff --git a/examples/opengl/paintedwindow/paintedwindow.pro b/examples/opengl/paintedwindow/paintedwindow.pro
index 1846aa4049..569eebe674 100644
--- a/examples/opengl/paintedwindow/paintedwindow.pro
+++ b/examples/opengl/paintedwindow/paintedwindow.pro
@@ -1,3 +1,5 @@
+QT += opengl
+
 HEADERS += paintedwindow.h
 SOURCES += paintedwindow.cpp main.cpp
 
diff --git a/examples/widgets/painting/shared/arthurwidgets.cpp b/examples/widgets/painting/shared/arthurwidgets.cpp
index c7c851270b..e24130e464 100644
--- a/examples/widgets/painting/shared/arthurwidgets.cpp
+++ b/examples/widgets/painting/shared/arthurwidgets.cpp
@@ -62,8 +62,8 @@
 #include <QRegularExpression>
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
-#include <QOpenGLPaintDevice>
 #if QT_CONFIG(opengl)
+#include <QtOpenGL/QOpenGLPaintDevice>
 #include <QtOpenGL/QOpenGLWindow>
 #endif
 
diff --git a/examples/widgets/windowcontainer/windowcontainer.cpp b/examples/widgets/windowcontainer/windowcontainer.cpp
index b920c85420..f7c146e2a9 100644
--- a/examples/widgets/windowcontainer/windowcontainer.cpp
+++ b/examples/widgets/windowcontainer/windowcontainer.cpp
@@ -60,7 +60,7 @@
 #include <QWidget>
 
 
-// Making use of the class from the opengl example in gui.
+// Making use of the class from the openglwindow example
 class Window : public OpenGLWindow
 {
     Q_OBJECT
diff --git a/examples/widgets/windowcontainer/windowcontainer.pro b/examples/widgets/windowcontainer/windowcontainer.pro
index 9ac7e4a5ab..664ac938a2 100644
--- a/examples/widgets/windowcontainer/windowcontainer.pro
+++ b/examples/widgets/windowcontainer/windowcontainer.pro
@@ -6,4 +6,4 @@ QT += widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/windowcontainer
 INSTALLS += target
 
-include(../../gui/openglwindow/openglwindow.pri)
+include(../../opengl/openglwindow/openglwindow.pri)