diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2023-03-22 17:08:04 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2023-03-23 15:13:03 +0100 |
| commit | d0dc0477b9c0350a257b284a90a813b2b00d1543 (patch) | |
| tree | 25cdab502f8be036b1a7690222f52348f0fb9fa9 /examples/opengl | |
| parent | 9daf2744b284413c8ca6df18bd48082bb7405bf8 (diff) | |
Remove erroneous widget dependency for hellogles3
Pick-to: 6.5
Change-Id: I42b476be28acd5b5c68f115bd98cf5c43cd8d97b
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'examples/opengl')
| -rw-r--r-- | examples/opengl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/opengl/hellogles3/doc/src/hellogles3.qdoc | 6 | ||||
| -rw-r--r-- | examples/opengl/opengl.pro | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/examples/opengl/CMakeLists.txt b/examples/opengl/CMakeLists.txt index e9bc975e72..2b075de2f7 100644 --- a/examples/opengl/CMakeLists.txt +++ b/examples/opengl/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_example(openglwindow) +qt_internal_add_example(hellogles3) if(TARGET Qt6::Widgets) qt_internal_add_example(contextinfo) qt_internal_add_example(2dpainting) @@ -9,6 +10,5 @@ if(TARGET Qt6::Widgets) qt_internal_add_example(qopenglwidget) qt_internal_add_example(cube) qt_internal_add_example(textures) - qt_internal_add_example(hellogles3) qt_internal_add_example(stereoqopenglwidget) endif() diff --git a/examples/opengl/hellogles3/doc/src/hellogles3.qdoc b/examples/opengl/hellogles3/doc/src/hellogles3.qdoc index cae0bd8b27..e76536d9d1 100644 --- a/examples/opengl/hellogles3/doc/src/hellogles3.qdoc +++ b/examples/opengl/hellogles3/doc/src/hellogles3.qdoc @@ -18,5 +18,11 @@ \li The shader code's version directive is different. \endlist + This example has no QWidget dependencies. Instead, it uses QOpenGLWindow, a + convenience subclass of QWindow that allows easy implementation of windows + that contain OpenGL-rendered content. In this sense it complements the + \l{OpenGL Window Example}, which shows the implementation of an OpenGL-based + QWindow without using the convenience subclass. + \image hellogles3-example.png */ diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 3a60b887ef..b0eac5ee9c 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = openglwindow +SUBDIRS = openglwindow \ + hellogles3 qtHaveModule(widgets) { SUBDIRS += contextinfo \ @@ -9,6 +10,5 @@ qtHaveModule(widgets) { qopenglwidget \ cube \ textures \ - hellogles3 \ stereoqopenglwidget } |