summaryrefslogtreecommitdiffstats
path: root/doc/src/overviews.qdoc
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-08-11 08:07:59 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-08-11 08:07:59 (GMT)
commit02e0523fe2b1dfd08eadaf127023306f6aa64c6f (patch)
tree26f374407ac0976e69f092517d69e1c93332492c /doc/src/overviews.qdoc
parentd501b04974df3615ac12fa93e11e893a44fbe715 (diff)
parentc7a18308a2725e4d1763777cb549f1ae74848005 (diff)
downloadQt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.zip
Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.gz
Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.bz2
Merge commit 'remotes/origin/4.7' into qt47s2
Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
Diffstat (limited to 'doc/src/overviews.qdoc')
-rw-r--r--doc/src/overviews.qdoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 51456ef..1c35a63 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -29,7 +29,6 @@
\page overviews.html
\title All Overviews and HOWTOs
- \ingroup qt-basic-concepts
\generatelist overviews
*/
@@ -63,7 +62,7 @@
/*!
\group qt-graphics
- \title Qt Graphics and Painting
+ \title Qt Graphics and Printing
\brief The Qt components for doing graphics.
@@ -91,11 +90,12 @@
/*!
\group qt-activex
- \title Qt For ActiveX
- \brief Qt API's for using ActiveX controls, servers, and COM.
+ \title ActiveX in Qt
\ingroup technology-apis
\ingroup platform-specific
+ \brief Qt API's for using ActiveX controls, servers, and COM.
+
These pages document Qt's API's for developing with ActiveX
controls, servers, and COM.
@@ -104,7 +104,7 @@
/*!
\group qt-sql
- \title Using SQL in Qt
+ \title SQL in Qt
\brief Qt API's for using SQL.
\ingroup technology-apis
\ingroup best-practices