diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 21:20:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 21:20:08 (GMT) |
| commit | b0c95377cadcaa3aa784ca909e13033c85233912 (patch) | |
| tree | d4242025c55c7bffd4e259a420bc6c39c48efa58 /doc/src/overviews.qdoc | |
| parent | c220a549d185989fc2b0f429ceb75dd6a84332f6 (diff) | |
| parent | e17a5bc80b2662b71d1bc0c37a46d8602c6e707d (diff) | |
| download | Qt-b0c95377cadcaa3aa784ca909e13033c85233912.zip Qt-b0c95377cadcaa3aa784ca909e13033c85233912.tar.gz Qt-b0c95377cadcaa3aa784ca909e13033c85233912.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:
qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGS
qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGS
Revised fix for pixmap loading
Assistant: Clean-up - fix spelling mistakes.
Assistant: Clean-up: Use const references in foreach loops.
Assistant: Clean-up: Mark constructors as explicit.
Assistant: Clean-up - add newlines to end of files.
Doc: Changes to the index page and second level pages linking to the index page.
Use Ctrl rather than Alt for switching tabs in the demo browser
Doc: fixing creator bugs, removing menus and textbox in the header
Update Japanese translations
Ukrainian translation updated
qtconfig and qvfb internationalization fixes
add full width characters to ending() in linguist
QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter
qdoc: Changed id attribute to be a UUID.
just build connman and networkmanager plugins on linux
Diffstat (limited to 'doc/src/overviews.qdoc')
| -rw-r--r-- | doc/src/overviews.qdoc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index 1c35a63..8e12fd3 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -62,6 +62,7 @@ /*! \group qt-graphics + \ingroup qt-basic-concepts \title Qt Graphics and Printing \brief The Qt components for doing graphics. @@ -71,6 +72,7 @@ /*! \group qt-network + \ingroup qt-basic-concepts \title Network programming with Qt \brief The these pages are about Qt's support for network programming. @@ -91,6 +93,7 @@ /*! \group qt-activex \title ActiveX in Qt + \ingroup qt-basic-concepts \ingroup technology-apis \ingroup platform-specific @@ -108,6 +111,8 @@ \brief Qt API's for using SQL. \ingroup technology-apis \ingroup best-practices + \ingroup qt-basic-concepts + These pages document Qt's API's for using SQL database systems in Qt applications. |