summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-html-templates.qdocconf
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2010-09-24 07:37:07 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2010-09-24 07:37:07 (GMT)
commitb21b3042c99cc400b523615f8331695f3a88da4b (patch)
treef1a36b5e6ca835297cabe7b9b469e5c7c523570f /tools/qdoc3/test/qt-html-templates.qdocconf
parent4286d8d20eae7b0876acc5afcecebc03cfc2514a (diff)
parent9634e133db1bf50a55ed44b3fe01e49954c80d08 (diff)
downloadQt-b21b3042c99cc400b523615f8331695f3a88da4b.zip
Qt-b21b3042c99cc400b523615f8331695f3a88da4b.tar.gz
Qt-b21b3042c99cc400b523615f8331695f3a88da4b.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/qdoc3/test/qt-html-templates.qdocconf')
-rw-r--r--tools/qdoc3/test/qt-html-templates.qdocconf4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index b716f7c..44aa918 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -40,7 +40,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" <li><a href=\"#\">Qt Topics</a> \n" \
" <ul id=\"topmenuTopic\"> \n" \
" <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
- " <li><a href=\"qtquick.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+ " <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
" <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
" <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
" <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
@@ -94,7 +94,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" <div id=\"list002\" class=\"list\">\n" \
" <ul id=\"ul002\" >\n" \
" <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
- " <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+ " <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
" <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
" <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
" <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \