summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-13 10:55:34 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-13 10:55:34 (GMT)
commit168524d4f642724fe9063500c0c39ab747f145b6 (patch)
tree9c13991d7e1ee6134fc0d99e1a6369c167100f76 /tools/qdoc3/test
parent764f558846b8ee6f115004fc939b890991c40bfa (diff)
parentbecf7dc2b4b7c2609350eb3236f854c1a4a344f5 (diff)
downloadQt-168524d4f642724fe9063500c0c39ab747f145b6.zip
Qt-168524d4f642724fe9063500c0c39ab747f145b6.tar.gz
Qt-168524d4f642724fe9063500c0c39ab747f145b6.tar.bz2
Merge branch '4.6' of ..\qt-graphics-4.6
Diffstat (limited to 'tools/qdoc3/test')
-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 7ceacb2..8c039eb 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -35,7 +35,7 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
\
"<script type=\"text/javascript\" src=\"http://www.google.com/jsapi\"></script>" \
"<script type=\"text/javascript\">google.load(\"elements\", \"1\", {packages: \"transliteration\"});</script>" \
- "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/t13n?form=cse-search-box&t13n_langs=en\"></script>" \
+ "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/t13n?form=cse-search-box&amp;t13n_langs=en\"></script>" \
\
- "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en\"></script>"\
+ "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/brand?form=cse-search-box&amp;lang=en\"></script>"\
"</tr></table></div></address>"