summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/src/getting-started/examples.qdoc31
-rw-r--r--doc/src/index.qdoc22
-rw-r--r--doc/src/overviews.qdoc13
3 files changed, 26 insertions, 40 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 0088817..400714f 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -492,18 +492,10 @@
*/
/*!
- \group gui-examples
- \title GUI Examples
- \brief These pages list examples of constructing GUI components.
-
- \generatelist{related}
-*/
-
-/*!
\page examples-widgets.html
\title Widgets Examples
\ingroup all-examples
- \ingroup gui-examples
+ \brief Lots of examples of how to use different kinds of widgets.
\contentspage Qt Examples
\nextpage Dialog Examples
@@ -554,7 +546,7 @@
\page examples-dialogs.html
\ingroup all-examples
\title Dialog Examples
- \ingroup gui-examples
+ \brief Using Qt's standard dialogs and building and using custom dialogs.
\previouspage Widgets Examples
\contentspage Qt Examples
@@ -586,7 +578,7 @@
\page examples-mainwindow.html
\ingroup all-examples
\title Main Window Examples
- \ingroup gui-examples
+ \building applications around a main window.
\previouspage Dialog Examples
\contentspage Qt Examples
@@ -616,7 +608,7 @@
\page examples-layouts.html
\ingroup all-examples
\title Layout Examples
- \ingroup gui-examples
+ Using Qt's layout-based approach to widget management.
\previouspage Main Window Examples
\contentspage Qt Examples
@@ -645,6 +637,7 @@
\page examples-itemviews.html
\ingroup all-examples
\title Item Views Examples
+ \brief Using the model/view design pattern to separate presentation from data.
\previouspage Layout Examples
\contentspage Qt Examples
@@ -681,18 +674,10 @@
*/
/*!
- \group graphics-examples
- \title Graphics Examples
- \brief These pages list examples of doing graphics.
-
- \generatelist{related}
-*/
-
-/*!
\page examples-graphicsview.html
\ingroup all-examples
\title Graphics View Examples
- \ingroup graphics-examples
+ \brief Using Qt to manage and interact with a large (potentially) number of graphics items.
\previouspage Item Views Examples
\contentspage Qt Examples
@@ -739,7 +724,6 @@
\page examples-painting.html
\ingroup all-examples
\title Painting Examples
- \ingroup graphics-examples
\previouspage QML Examples and Demos
\contentspage Qt Examples
@@ -821,7 +805,6 @@
\page examples-draganddrop.html
\ingroup all-examples
\title Drag and Drop Examples
- \ingroup gui-examples
\previouspage Desktop Examples
\contentspage Qt Examples
@@ -988,7 +971,6 @@
\page examples-opengl.html
\ingroup all-examples
\title OpenGL Examples
- \ingroup graphics-examples
\previouspage Inter-Process Communication Examples
\contentspage Qt Examples
@@ -1024,7 +1006,6 @@
\page examples-openvg.html
\ingroup all-examples
\title OpenVG Examples
- \ingroup graphics-examples
\previouspage OpenGL Examples
\contentspage Qt Examples
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 92f91e6..e6efe4d 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -70,26 +70,26 @@
<div class="indexboxcont indexboxbar ">
<div class="sectionlist tricol">
<ul>
- <li><a href="modules.html">All modules</a></li>
- <li><a href="classes.html">All classes</a></li>
- <li><a href="functions.html">All functions</a></li>
- <li><a href="namespaces.html">All namespaces</a></li>
- <li><a href="platform-specific.html">Platform support &amp; specifics</a></li>
+ <li><a href="classes.html">Class index</a></li>
+ <li><a href="functions.html">Function index</a></li>
+ <li><a href="modules.html">Modules</a></li>
+ <li><a href="namespaces.html">Namespaces</a></li>
+ <li><a href="qtglobal.html">Global stuff</a></li>
+ <li><a href="qdeclarativeelements.html">QML elements</a></li>
</ul>
</div>
<div class="sectionlist tricol">
<ul>
- <li><a href="object.html">QObject model</a></li>
- <li><a href="application-windows.html">Window architecture</a></li>
- <li><a href="widgets-and-layouts.html">Styles &amp; layout</a></li>
- <li><a href="eventsandfilters.html">Event handling</a></li>
- <li><a href="paintsystem.html">Paint system</a></li>
+ <li><a href="qt-basic-concepts.html">Basic Qt Architecture</a></li>
+ <li><a href="declarativeui.html">Device UI's &amp; Qt Quick</a></li>
+ <li><a href="qt-graphics.html">Graphics &amp Painting</a></li>
+ <li><a href="qt-gui-concepts.html">Desktop UI components</a></li>
+ <li><a href="platform-specific.html">Platform-specific info</a></li>
</ul>
</div>
<div class="sectionlist">
<ul>
<li><a href="graphicsview.html">Canvas UI with Graphics View</a></li>
- <li><a href="declarativeui.html">UI design &amp; Qt Quick</a></li>
<li><a href="io.html">Input/output</a></li>
<li><a href="webintegration.html">Integrating Web Content</a></li>
<li><a href="developing-with-qt.html">X-platform, debug &amp; deploy</a></li>
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index b2ba3a1..cb6541d 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -49,9 +49,9 @@
/*!
\group qt-basic-concepts
- \title Qt Basic Concepts
+ \title Basic Qt Architecture
- \brief The basic concepts of the Qt cross-platform application and UI framework.
+ \brief The basic architecture of the Qt cross-platform application and UI framework.
Qt is a cross-platform application and UI framework for writing
web-enabled applications for desktop, mobile, and embedded
@@ -63,9 +63,14 @@
/*!
\group qt-gui-concepts
- \title Qt GUI Construction
+ \title Qt Desktop UI Components
- \brief The Qt components for constructing Graphical User Intefaces.
+ \brief The Qt components for constructing native look & feel desktop UI's.
+
+ These pages are about Qt's traditional set of GUI components for
+ building both native look ^ feel and custom UI's for the desktop
+ environment. Use \l {declarativeui.html} {Qt Quick} for building
+ UI's for mobile devices.
\generatelist {related}
*/