diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/doc/qtopengl.qdocconf | 4 | ||||
| -rw-r--r-- | src/opengl/doc/snippets/code/doc_gui_widgets_qopenglwidget.cpp (renamed from src/widgets/doc/snippets/code/doc_gui_widgets_qopenglwidget.cpp) | 0 | ||||
| -rw-r--r-- | src/opengl/doc/snippets/code/src_gui_opengl_qopenglbuffer.cpp (renamed from src/gui/doc/snippets/code/src_gui_opengl_qopenglbuffer.cpp) | 0 | ||||
| -rw-r--r-- | src/opengl/doc/snippets/code/src_gui_opengl_qopengldebug.cpp (renamed from src/gui/doc/snippets/code/src_gui_opengl_qopengldebug.cpp) | 0 | ||||
| -rw-r--r-- | src/opengl/doc/snippets/code/src_gui_qopenglshaderprogram.cpp (renamed from src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp) | 0 | ||||
| -rw-r--r-- | src/opengl/doc/src/qtopengl-index.qdoc | 3 | ||||
| -rw-r--r-- | src/opengl/doc/src/qtopengl-module.qdoc | 16 |
7 files changed, 18 insertions, 5 deletions
diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf index 6153e97e04..857ad46c8f 100644 --- a/src/opengl/doc/qtopengl.qdocconf +++ b/src/opengl/doc/qtopengl.qdocconf @@ -11,8 +11,10 @@ project = QtOpenGL # <rootdir>/examples. # Paths are relative to the location of this file. -headerdirs += .. +headerdirs += .. \ + ../../openglwidgets sourcedirs += .. \ + ../../openglwidgets \ ../../../examples/opengl/doc/src exampledirs += ../../../examples/opengl \ . \ diff --git a/src/widgets/doc/snippets/code/doc_gui_widgets_qopenglwidget.cpp b/src/opengl/doc/snippets/code/doc_gui_widgets_qopenglwidget.cpp index 633a413b4f..633a413b4f 100644 --- a/src/widgets/doc/snippets/code/doc_gui_widgets_qopenglwidget.cpp +++ b/src/opengl/doc/snippets/code/doc_gui_widgets_qopenglwidget.cpp diff --git a/src/gui/doc/snippets/code/src_gui_opengl_qopenglbuffer.cpp b/src/opengl/doc/snippets/code/src_gui_opengl_qopenglbuffer.cpp index bd768b1ed7..bd768b1ed7 100644 --- a/src/gui/doc/snippets/code/src_gui_opengl_qopenglbuffer.cpp +++ b/src/opengl/doc/snippets/code/src_gui_opengl_qopenglbuffer.cpp diff --git a/src/gui/doc/snippets/code/src_gui_opengl_qopengldebug.cpp b/src/opengl/doc/snippets/code/src_gui_opengl_qopengldebug.cpp index 241450c23a..241450c23a 100644 --- a/src/gui/doc/snippets/code/src_gui_opengl_qopengldebug.cpp +++ b/src/opengl/doc/snippets/code/src_gui_opengl_qopengldebug.cpp diff --git a/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp b/src/opengl/doc/snippets/code/src_gui_qopenglshaderprogram.cpp index 131936ed3f..131936ed3f 100644 --- a/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp +++ b/src/opengl/doc/snippets/code/src_gui_qopenglshaderprogram.cpp diff --git a/src/opengl/doc/src/qtopengl-index.qdoc b/src/opengl/doc/src/qtopengl-index.qdoc index 53f1599c1b..a655a3e20f 100644 --- a/src/opengl/doc/src/qtopengl-index.qdoc +++ b/src/opengl/doc/src/qtopengl-index.qdoc @@ -31,9 +31,6 @@ \brief The Qt OpenGL module offers classes that make it easy to use OpenGL in Qt applications. - \warning This module should not be used anymore for new code. Please - use the corresponding OpenGL classes in \l{Qt GUI}. - \section1 Introduction OpenGL is a standard API for rendering 3D graphics. OpenGL only diff --git a/src/opengl/doc/src/qtopengl-module.qdoc b/src/opengl/doc/src/qtopengl-module.qdoc index 0ba78ed5dc..0d1c9e687f 100644 --- a/src/opengl/doc/src/qtopengl-module.qdoc +++ b/src/opengl/doc/src/qtopengl-module.qdoc @@ -35,5 +35,19 @@ \brief The Qt OpenGL module offers classes that make it easy to use OpenGL in Qt applications. - \warning This module should not be used anymore for new code. + The \l{Qt OpenGL Widgets C++ Classes}{Qt OpenGL Widgets} library provides + a C++ widget class for rendering OpenGL graphics into widgets UIs. + + \generatelist classesbymodule QtOpenGLWidgets +*/ + +/* + This "module" only exists so that classes in that separate library have + the correct build system documentation. +*/ +/*! + \module QtOpenGLWidgets + \title Qt OpenGL Widgets C++ Classes + \qtcmakepackage OpenGLWidgets + \qtvariable openglwidgets */ |