From 384558d78a9a1bf1d8c8483036e32b616d7f275b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 10 Dec 2014 13:50:09 +0100 Subject: Qt OpenGL is deprecated with 5.4. Show that in the docs as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idadf24d5331443d2c947a633029c7d4ea2305caf Reviewed-by: Laszlo Agocs Reviewed-by: Topi Reiniö --- src/opengl/doc/src/qtopengl-index.qdoc | 5 ++--- 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 -- cgit v1.2.3