diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-25 18:00:47 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-25 18:00:47 +0200 |
| commit | 913ea0d5cdee3a182a811db2bb9440aee679ae08 (patch) | |
| tree | 79708faf5c379948eb5aa2f84cb24488a9cb0c4f /doc/src/porting | |
| parent | 5c45c66b1743645b77826ad61508a79eadd48414 (diff) | |
| parent | d9dd68c4400c3ca590ea425d6f3d070ea6094099 (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
src/opengl/opengl.pro
src/opengl/qgl_p.h
src/plugins/bearer/connman/qconnmanservice_linux.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/assistant/tools/assistant/openpageswidget.h
Diffstat (limited to 'doc/src/porting')
| -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 7d2a400ae4..b160d63916 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 |