diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 15:35:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 15:35:48 (GMT) |
| commit | 1d09376c4eec88ba94f00a4b045fc425c5f51346 (patch) | |
| tree | 46a4031a70a16e5a610585cde5932e38129a74aa /doc/src/widgets-and-layouts | |
| parent | 1b599a66e5c22dacd002f33ddaa00a6010e230b2 (diff) | |
| parent | ab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d (diff) | |
| download | Qt-1d09376c4eec88ba94f00a4b045fc425c5f51346.zip Qt-1d09376c4eec88ba94f00a4b045fc425c5f51346.tar.gz Qt-1d09376c4eec88ba94f00a4b045fc425c5f51346.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: (34 commits)
Modified descriptions of QBasicTimer class and isActive() function.
Translation work for 4.7
Some more french translations.
Some french translations
doc: Re-introduced next/previous page links in the footer.
Doc: Fixing validation bugs
Removed duplicate case for const variable snippet.
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
doc: Fixed some S60 qdoc errors.
doc: Fixed some missing images.
Adding Getting Started files. Auto test passes.
Changed width of the document. Part of the fix for QTBUG-12180
Revert "Doc: Adding GS QML example files"
Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Adding a description for the Spectrum Analyzer demo. For QTBUG-12180
qdoc: added application flags in doc.pri and fixed QTBUG-12388
...
Diffstat (limited to 'doc/src/widgets-and-layouts')
| -rw-r--r-- | doc/src/widgets-and-layouts/widgets.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc index 18b8be1..f2475c2 100644 --- a/doc/src/widgets-and-layouts/widgets.qdoc +++ b/doc/src/widgets-and-layouts/widgets.qdoc @@ -29,6 +29,7 @@ \page widgets-and-layouts.html \title Widgets and Layouts \ingroup qt-gui-concepts + \ingroup qt-basic-concepts \brief The primary elements for designing user interfaces in Qt. \section1 Widgets |