summaryrefslogtreecommitdiffstats
path: root/doc/src/qt-webpages.qdoc
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-07-04 14:45:27 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-07-04 14:45:27 (GMT)
commit8b89d0aa973c52b44112f10c9fbd9701b17bb333 (patch)
treebf4206266ef3f6114b78db08214782705daa5c56 /doc/src/qt-webpages.qdoc
parent25bbcf9605f65548d7f581304b7d8ad300aa9937 (diff)
parent19e9fd70bb39c10b69eb6220c2d5b772e126324c (diff)
downloadQt-8b89d0aa973c52b44112f10c9fbd9701b17bb333.zip
Qt-8b89d0aa973c52b44112f10c9fbd9701b17bb333.tar.gz
Qt-8b89d0aa973c52b44112f10c9fbd9701b17bb333.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team
Diffstat (limited to 'doc/src/qt-webpages.qdoc')
-rw-r--r--doc/src/qt-webpages.qdoc15
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index 7f456b9..c993575 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -539,3 +539,18 @@
\externalpage http://qt.nokia.com/partners/qt-in-education/qt-in-education-course-material/
\title Qt in Education Course Material
*/
+
+/*!
+ \externalpage http://developer.qt.nokia.com/
+ \title Qt Developer Network
+*/
+
+/*!
+ \externalpage http://developer.qt.nokia.com/wiki/Qt_Modules_Maturity_Level
+ \title Qt Modules' Maturity Levels - Modules List
+*/
+
+/*!
+ \externalpage http://labs.qt.nokia.com/2011/05/03/qt-modules-maturity-level/
+ \title Qt Modules' Maturity Level - Description
+*/