diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-22 21:44:18 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-22 21:44:18 (GMT) |
commit | d9a32562ed281e0d4dbb194b3f3fce9f93f8cd46 (patch) | |
tree | ed45ff7bdd59404c6506d83a61a3e1aeb66ee5ab /doc/src/porting/qt4-mainwindow.qdoc | |
parent | 45a549dd8ad57bdd070d40a3d0606ab8429ceda6 (diff) | |
parent | 2517a2c7ef8b3ee0f2651f191f49d27930129756 (diff) | |
download | Qt-d9a32562ed281e0d4dbb194b3f3fce9f93f8cd46.zip Qt-d9a32562ed281e0d4dbb194b3f3fce9f93f8cd46.tar.gz Qt-d9a32562ed281e0d4dbb194b3f3fce9f93f8cd46.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:
Doc: Adding pages to the overviews and updating the index page.
Doc: Updating pages and linking them to the overviews.
Diffstat (limited to 'doc/src/porting/qt4-mainwindow.qdoc')
-rw-r--r-- | doc/src/porting/qt4-mainwindow.qdoc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/src/porting/qt4-mainwindow.qdoc b/doc/src/porting/qt4-mainwindow.qdoc index 7d2a400..b160d63 100644 --- a/doc/src/porting/qt4-mainwindow.qdoc +++ b/doc/src/porting/qt4-mainwindow.qdoc @@ -28,7 +28,12 @@ /*! \page qt4-mainwindow.html \title The Qt 4 Main Window Classes + \ingroup qt-basic-concepts + + \brief Overview of the Main Window concept and Classes + + \contentspage {What's New in Qt 4}{Home} \previouspage The Scribe Classes \nextpage The New Qt Designer |