diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 17:47:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 17:47:05 (GMT) |
| commit | 84408e18ac5a5ccc69cf34832f31ef63b3ff9f11 (patch) | |
| tree | 16a5eb509930c5696e01b62c4f71146fd262296a /doc/src/qt4-intro.qdoc | |
| parent | 5d5cfa71fbb7ed7b4e7f43f015acbeb7b8b00807 (diff) | |
| parent | 89c6b83ee22ceb009c26c826cc4158d179312434 (diff) | |
| download | Qt-84408e18ac5a5ccc69cf34832f31ef63b3ff9f11.zip Qt-84408e18ac5a5ccc69cf34832f31ef63b3ff9f11.tar.gz Qt-84408e18ac5a5ccc69cf34832f31ef63b3ff9f11.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Clarified the range of return values from QLineF::angle().
Doc: Fixed \since declarations.
Doc: Standardized on QtQuick for \since declarations.
Doc: Removed whitespace.
Modified \since command behavior slightly to handle project and version.
Doc: Added a simple introduction to Qt and fixed links.
Doc: Added more appropriate links to help reduce confusion.
Doc: Removed non-ASCII characters from the documentation.
qdoc: Fixed QTBUG-19338
Diffstat (limited to 'doc/src/qt4-intro.qdoc')
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 41d8b2e..1547a7c 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -132,7 +132,7 @@ In Qt 4.4: \list - \o \l{Webkit in QT}{Qt WebKit integration}, making it possible for developers + \o \l{WebKit in Qt}{Qt WebKit integration}, making it possible for developers to use a fully-featured Web browser to display documents and access online services. \o A multimedia API provided by the \l{Phonon Overview}{Phonon Multimedia Framework}. @@ -610,7 +610,6 @@ introduced in Qt 4.7. \sincelist 4.7 - */ /*! |