diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-19 00:35:19 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-19 00:35:19 (GMT) |
commit | 0cb57328453c476b01b058d57211afee197d6a82 (patch) | |
tree | 87f58d0ba221606701c888db2a5f2262cc384cf8 /doc/src/qt-webpages.qdoc | |
parent | ff7f7dd596511de4c629b6c7f97d32a21049bb95 (diff) | |
parent | 7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a (diff) | |
download | Qt-0cb57328453c476b01b058d57211afee197d6a82.zip Qt-0cb57328453c476b01b058d57211afee197d6a82.tar.gz Qt-0cb57328453c476b01b058d57211afee197d6a82.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Improved comment finding code.
Added language information to the pure documentation parser.
Doc: Fixes to Qt tutorial
Fixed external link to DevNet Wiki.
qdoc: Fixed a crash caused by accessing a null pointer.
Doc: Fixed the example of an encoded URL in the class description.
Doc: Added a copy of the online style images for the qdoc manual.
Doc: Removed the Google Analytics script.
Diffstat (limited to 'doc/src/qt-webpages.qdoc')
-rw-r--r-- | doc/src/qt-webpages.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc index c993575..f67ff83 100644 --- a/doc/src/qt-webpages.qdoc +++ b/doc/src/qt-webpages.qdoc @@ -221,7 +221,7 @@ \title Forums on Qt Developer Network */ /*! - \externalpage http://developer.qt.nokia.com/wikis + \externalpage http://developer.qt.nokia.com/wiki \title Wiki on Qt Developer Network */ /*! |