diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-13 05:05:43 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-13 05:05:43 (GMT) |
commit | 8c6b5c53a2f6f8c9113fa616b458dde0be86a9e2 (patch) | |
tree | f3883fb4fce6227a9fe33a4d53449ffc4c4cf505 /doc/src/overviews.qdoc | |
parent | 50711dd7aa22052eff58431d9f4e95e1a688047e (diff) | |
parent | d41ccae68683dd0d35c20affec7e5c55ce6bca37 (diff) | |
download | Qt-8c6b5c53a2f6f8c9113fa616b458dde0be86a9e2.zip Qt-8c6b5c53a2f6f8c9113fa616b458dde0be86a9e2.tar.gz Qt-8c6b5c53a2f6f8c9113fa616b458dde0be86a9e2.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (159 commits)
Doc: Adding loading image to search textbox
qdoc: Yet another revision of the top doc page.
Doc: Update on web template
Added QDateTime::msecsTo()
Doc: Fixed tables and images for the new docs
qdoc: Yet another revision of the top doc page.
Revert "Improve QUrl handling of local file paths"
Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
qdoc: Another revision of the top doc page.
Doc correction to css
Doc: Updates to the html template and javascript
tst_SuiteTest: Fix a meaningless switch statement
My 4.7.0 changelog entries.
qdoc: Fixed annotated list generation to use <td>, not <th>.
Doc: Tuning search script
qdoc: Reorganized examples panel.
Doc: Chages to search feature, css and table order
QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
...
Diffstat (limited to 'doc/src/overviews.qdoc')
-rw-r--r-- | doc/src/overviews.qdoc | 68 |
1 files changed, 62 insertions, 6 deletions
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index 7302e30..0b82388 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -48,19 +48,75 @@ */ /*! - \group frameworks-technologies - \title Frameworks and Technologies + \group qt-basic-concepts + \title Basic Qt Architecture - \brief Documentation about the frameworks and technologies in Qt + \brief The basic architecture of the Qt cross-platform application and UI framework. - These documents dive into the frameworks of classes that Qt provides, - and provide background information about the technical solutions used - in Qt's architecture. + Qt is a cross-platform application and UI framework for writing + web-enabled applications for desktop, mobile, and embedded + operating systems. These pages explain basic architectural + concepts of Qt: + + \generatelist {related} + */ + +/*! + \group qt-gui-concepts + \title Qt Desktop UI Components + + \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} + */ + +/*! + \group qt-graphics + \title Qt Graphics and Painting + + \brief The Qt components for doing graphics. + + \generatelist {related} + */ + +/*! + \group qt-network + \title Network programming with Qt + + \brief The these pages are about Qt's support for network programming. + + \generatelist {related} + */ + +/*! + \group technology-apis + \title Qt API's for other technologies + + These pages document Qt's API's for some widely-used standards and + technologies. \generatelist{related} */ /*! + \group qt-activex + \title Qt For ActiveX + \brief Qt API's for using ActiveX controls, servers, and COM. + \ingroup technology-apis + \ingroup platform-specific + + These pages document Qt's API's for developing with ActiveX + controls, servers, and COM. + + \generatelist{related} +*/ + +/*! \group best-practices \title How-To's and Best Practices |