diff options
| author | Laszlo Agocs <[email protected]> | 2023-03-22 17:10:10 +0100 |
|---|---|---|
| committer | Laszlo Agocs <[email protected]> | 2023-03-23 15:13:03 +0100 |
| commit | 7c23aa6bc5e5d7b6e891fb0c30a72091a60c79eb (patch) | |
| tree | 8b7c35a6fb370a8af55e9839b5229bb41639d72e | |
| parent | d0dc0477b9c0350a257b284a90a813b2b00d1543 (diff) | |
Move hellogles3 docs to where the rest of these files live
And expand the note in the openglwindow example to point to
hellogles3 as well.
Pick-to: 6.5
Change-Id: I2c0ee9b83fa59752d937c57eaf0194f0d0a8a7d9
Reviewed-by: Christian Strømme <[email protected]>
| -rw-r--r-- | examples/opengl/doc/images/hellogles3-example.png (renamed from examples/opengl/hellogles3/doc/images/hellogles3-example.png) | bin | 61792 -> 61792 bytes | |||
| -rw-r--r-- | examples/opengl/doc/src/hellogles3.qdoc (renamed from examples/opengl/hellogles3/doc/src/hellogles3.qdoc) | 0 | ||||
| -rw-r--r-- | examples/opengl/doc/src/openglwindow.qdoc | 2 |
3 files changed, 2 insertions, 0 deletions
diff --git a/examples/opengl/hellogles3/doc/images/hellogles3-example.png b/examples/opengl/doc/images/hellogles3-example.png Binary files differindex e089b9470a1..e089b9470a1 100644 --- a/examples/opengl/hellogles3/doc/images/hellogles3-example.png +++ b/examples/opengl/doc/images/hellogles3-example.png diff --git a/examples/opengl/hellogles3/doc/src/hellogles3.qdoc b/examples/opengl/doc/src/hellogles3.qdoc index e76536d9d12..e76536d9d12 100644 --- a/examples/opengl/hellogles3/doc/src/hellogles3.qdoc +++ b/examples/opengl/doc/src/hellogles3.qdoc diff --git a/examples/opengl/doc/src/openglwindow.qdoc b/examples/opengl/doc/src/openglwindow.qdoc index 1a9d4308ba5..505ff20fbc9 100644 --- a/examples/opengl/doc/src/openglwindow.qdoc +++ b/examples/opengl/doc/src/openglwindow.qdoc @@ -12,6 +12,8 @@ \note This is a low level example of how to use QWindow with OpenGL. In practice you should consider using the higher level QOpenGLWindow class. + See the \l{Hello GLES3 Example} for a demonstration of the QOpenGLWindow + convenience class. \section1 OpenGLWindow Super Class |
