diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
| commit | ff6f17c92ad1bfa898bc89a5ccb65361d443c591 (patch) | |
| tree | f0ac9ead3755b886975dada5c977e969600526fd /doc/src/overviews.qdoc | |
| parent | cd1b5d933575fb801ad3014f3d7fd7c268a362d1 (diff) | |
| parent | 1970e2d46656db8178636e06c82287f536b626c7 (diff) | |
| download | Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.zip Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.gz Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/overviews.qdoc')
| -rw-r--r-- | doc/src/overviews.qdoc | 10 |
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 |