summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/opengl/doc/images/opengl-examples.pngbin0 -> 25685 bytes
-rw-r--r--src/opengl/doc/src/qtopengl-examples.qdoc46
-rw-r--r--src/widgets/doc/src/qtwidgets-examples.qdoc14
3 files changed, 50 insertions, 10 deletions
diff --git a/src/opengl/doc/images/opengl-examples.png b/src/opengl/doc/images/opengl-examples.png
new file mode 100644
index 0000000000..8acdf8cabd
--- /dev/null
+++ b/src/opengl/doc/images/opengl-examples.png
Binary files differ
diff --git a/src/opengl/doc/src/qtopengl-examples.qdoc b/src/opengl/doc/src/qtopengl-examples.qdoc
new file mode 100644
index 0000000000..2ad4f27404
--- /dev/null
+++ b/src/opengl/doc/src/qtopengl-examples.qdoc
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \ingroup all-examples
+ \title OpenGL Examples from the Qt OpenGL module
+ \brief Accessing OpenGL from Qt.
+ \group examples-widgets-opengl
+
+ \image opengl-examples.png
+
+ These examples describe how to use the Qt OpenGL Module. For new code,
+ please use the OpenGL classes in the \l {Qt GUI Module}.
+
+
+ Qt provides support for integration with OpenGL implementations on all
+ platforms, giving developers the opportunity to display hardware accelerated
+ 3D graphics alongside a more conventional user interface.
+
+ These examples demonstrate the basic techniques used to take advantage of
+ OpenGL in Qt applications.
+*/
diff --git a/src/widgets/doc/src/qtwidgets-examples.qdoc b/src/widgets/doc/src/qtwidgets-examples.qdoc
index 05402d98bc..b321942a70 100644
--- a/src/widgets/doc/src/qtwidgets-examples.qdoc
+++ b/src/widgets/doc/src/qtwidgets-examples.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \page qtwidgets-examples.html
\title Qt Widgets Examples
\brief Lots of examples of how to use different kinds of widgets.
\ingroup all-examples
+ \group examples-widgets
\image widget-examples.png
@@ -43,12 +43,9 @@
be used to change the appearance of standard widgets and appropriately
written custom widgets.
- \annotatedlist examples-widgets
-
*/
/*!
- \page examples-painting.html
\ingroup all-examples
\title Painting Examples
\brief How to use the Qt painting system.
@@ -56,19 +53,17 @@
\image painting-examples.png
- Qt's painting system is able to render vector graphics, images, and outline
- font-based text with sub-pixel accuracy accuracy using anti-aliasing to
- improve rendering quality.
+ Qt's painting system is able to render vector graphics, images,
+ and outline font-based text with sub-pixel accuracy using
+ anti-aliasing to improve rendering quality.
These examples show the most common techniques that are used when painting
with Qt, from basic concepts such as drawing simple primitives to the use of
transformations.
- \annotatedlist{painting-examples}
*/
/*!
- \page examples-richtext.html
\ingroup all-examples
\title Rich Text Examples
\brief Using the document-oriented rich text engine.
@@ -84,7 +79,6 @@
*/
/*!
- \page examples-desktop.html
\ingroup all-examples
\title Desktop Examples
\brief Integrating your Qt application with your favorite desktop.