diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-13 21:58:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-13 21:58:44 (GMT) |
| commit | 4e5dedc7b2729152470827e50ee47d6a5bb6a500 (patch) | |
| tree | 057d46123539cc3e3541aa1686ba4f1729b574fd /doc/src | |
| parent | 48592026bc9eb024f304411895c3f233b2296cfa (diff) | |
| parent | 0193617fe21486561ae55403b80419ad1a9105b2 (diff) | |
| download | Qt-4e5dedc7b2729152470827e50ee47d6a5bb6a500.zip Qt-4e5dedc7b2729152470827e50ee47d6a5bb6a500.tar.gz Qt-4e5dedc7b2729152470827e50ee47d6a5bb6a500.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Describe QStackedWidget::removeWidget() more thoroughly.
Doc: Resized the window and added a title.
Doc: Added a missing example to the list of Graphics View examples.
Doc: Clarified why a path matches in the example given.
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/deployment/qt-conf.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc index 4357c88..b195889 100644 --- a/doc/src/deployment/qt-conf.qdoc +++ b/doc/src/deployment/qt-conf.qdoc @@ -128,7 +128,7 @@ \list \o 4.0.1 matches \c Paths/4 \o 4.1.5 matches \c Paths/4.1 - \o 4.6.3 matches \c Paths/4.2.5 + \o 4.6.3 matches \c Paths/4.2.5 (because 4.2.5 is the latest version with the same major version number) \o 5.0.0 matches \c Paths \o 6.0.2 matches \c Paths/6 \endlist |