diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
| commit | aaff94c2df665035addb90714bab4722003894da (patch) | |
| tree | 3af76e8aa4dbf86a86b1e4d2ad2f6dda06374ee0 /src/opengl | |
| parent | 2302d386c7a1aa1a96658f79c236d6b8a59db7ac (diff) | |
| parent | 1196f691120d77ab3be55f21824aba645210fb8c (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/kernel/qplatformsystemtrayicon.cpp
src/gui/kernel/qplatformsystemtrayicon.h
src/plugins/platforms/xcb/xcb-plugin.pro
Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/doc/src/qtopengl-index.qdoc | 5 | ||||
| -rw-r--r-- | src/opengl/doc/src/qtopengl-module.qdoc | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/opengl/doc/src/qtopengl-index.qdoc b/src/opengl/doc/src/qtopengl-index.qdoc index ff946c6e4e..3ba5b396ab 100644 --- a/src/opengl/doc/src/qtopengl-index.qdoc +++ b/src/opengl/doc/src/qtopengl-index.qdoc @@ -31,9 +31,8 @@ \brief The Qt OpenGL module offers classes that make it easy to use OpenGL in Qt applications. - \warning Apart from the \l{QGLWidget} class, this module should not be used - anymore for new code. Please use the corresponding OpenGL classes in - \l{Qt Gui}. + \warning This module should not be used anymore for new code. Please + use the corresponding OpenGL classes in \l{Qt Gui}. OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D rendering and provides little or no support for GUI diff --git a/src/opengl/doc/src/qtopengl-module.qdoc b/src/opengl/doc/src/qtopengl-module.qdoc index 8619f04a97..aec68e44c0 100644 --- a/src/opengl/doc/src/qtopengl-module.qdoc +++ b/src/opengl/doc/src/qtopengl-module.qdoc @@ -34,9 +34,8 @@ \brief The Qt OpenGL module offers classes that make it easy to use OpenGL in Qt applications. - \warning Apart from the \l{QGLWidget} class, this module should not be used - anymore for new code. Please use the corresponding OpenGL classes in - \l{Qt Gui}. + \warning This module should not be used anymore for new code. Please + use the corresponding OpenGL classes in \l{Qt Gui}. OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D rendering and provides little or no support for GUI |