From 0fac8bf9a44640e28e68a92f2aec41e3a7a6d70d Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 22 Mar 2023 17:10:10 +0100 Subject: [PATCH] Move hellogles3 docs to where the rest of these files live MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And expand the note in the openglwindow example to point to hellogles3 as well. Change-Id: I2c0ee9b83fa59752d937c57eaf0194f0d0a8a7d9 Reviewed-by: Christian Strømme (cherry picked from commit 7c23aa6bc5e5d7b6e891fb0c30a72091a60c79eb) Reviewed-by: Qt Cherry-pick Bot --- .../doc/images/hellogles3-example.png | Bin .../opengl/{hellogles3 => }/doc/src/hellogles3.qdoc | 0 examples/opengl/doc/src/openglwindow.qdoc | 2 ++ 3 files changed, 2 insertions(+) rename examples/opengl/{hellogles3 => }/doc/images/hellogles3-example.png (100%) rename examples/opengl/{hellogles3 => }/doc/src/hellogles3.qdoc (100%) diff --git a/examples/opengl/hellogles3/doc/images/hellogles3-example.png b/examples/opengl/doc/images/hellogles3-example.png similarity index 100% rename from examples/opengl/hellogles3/doc/images/hellogles3-example.png rename to examples/opengl/doc/images/hellogles3-example.png diff --git a/examples/opengl/hellogles3/doc/src/hellogles3.qdoc b/examples/opengl/doc/src/hellogles3.qdoc similarity index 100% rename from examples/opengl/hellogles3/doc/src/hellogles3.qdoc rename to 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