summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-html-templates.qdocconf
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-07-08 11:16:52 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-07-08 11:16:52 (GMT)
commitd06fce88dfe9b07dcc78ed7ab93a1681431138eb (patch)
tree28870ce09c5403878d4bbcf59d857d6bdf294e79 /tools/qdoc3/test/qt-html-templates.qdocconf
parentea7aeec080c9c39449017ff683b27d3659236336 (diff)
parentb245cb41f2fbc69d5829fe41f42891dfd74d23ba (diff)
downloadQt-d06fce88dfe9b07dcc78ed7ab93a1681431138eb.zip
Qt-d06fce88dfe9b07dcc78ed7ab93a1681431138eb.tar.gz
Qt-d06fce88dfe9b07dcc78ed7ab93a1681431138eb.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/qdoc3/test/qt-html-templates.qdocconf')
-rw-r--r--tools/qdoc3/test/qt-html-templates.qdocconf3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index e032d6f..b428a90 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -17,12 +17,11 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" <div id=\"nav-topright\">\n" \
" <ul>\n" \
" <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
- " <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/">DEV</a></li>\n" \
+ " <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
" <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
" <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
" DOC</a></li>\n" \
" <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
- " <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
" </ul>\n" \
" </div>\n" \
" <div id=\"shortCut\">\n" \