diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-14 13:01:13 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-14 13:01:13 (GMT) |
| commit | 086a010a63895c6e6d178c1de9434483f11b2d34 (patch) | |
| tree | bb2542f04438b42ae5c61b1c3a6330f011700474 /doc/src/qt-webpages.qdoc | |
| parent | 0fe36ac832abf8f8d438b21fce0177b65b3bbf3a (diff) | |
| parent | 5cb2226ddf96555417f08c9bfe35addfc93f6acd (diff) | |
| download | Qt-086a010a63895c6e6d178c1de9434483f11b2d34.zip Qt-086a010a63895c6e6d178c1de9434483f11b2d34.tar.gz Qt-086a010a63895c6e6d178c1de9434483f11b2d34.tar.bz2 | |
Merge branch 'qdoc-simplified' into mimir-simplified
Conflicts:
tools/qdoc3/atom.h
tools/qdoc3/qdoc3.pro
Diffstat (limited to 'doc/src/qt-webpages.qdoc')
| -rw-r--r-- | doc/src/qt-webpages.qdoc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc index 05817df..0a03157 100644 --- a/doc/src/qt-webpages.qdoc +++ b/doc/src/qt-webpages.qdoc @@ -201,11 +201,6 @@ */ /*! - \externalpage http://labs.qt.nokia.com/gitweb?p=qtestlib-tools;a=summary - \title qtestlib-tools -*/ - -/*! \externalpage http://qt.nokia.com/products/library/modular-class-library#info_scripting \title Qt Script for Applications (QSA) */ @@ -239,3 +234,13 @@ \externalpage http://get.qt.nokia.com/nokiasmartinstaller/ \title Smart Installer */ + +/*! + \externalpage http://qt.gitorious.org/qt-labs/qtestlib-tools + \title qtestlib-tools +*/ + +/*! + \externalpage http://labs.qt.nokia.com + \title Qt Labs +*/ |