summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-05-10 10:51:37 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-05-10 10:51:37 (GMT)
commit48d22dbcf4a8608b0e5242b25f0b4f771656b683 (patch)
tree35667678172e932a9e8795d96037180f14905af8 /tools
parent346215c3d9f0be621a833e7c735501504c7aa0b0 (diff)
downloadQt-48d22dbcf4a8608b0e5242b25f0b4f771656b683.zip
Qt-48d22dbcf4a8608b0e5242b25f0b4f771656b683.tar.gz
Qt-48d22dbcf4a8608b0e5242b25f0b4f771656b683.tar.bz2
Doc: Updates to the html template and javascript
Reviewed-by: Morten Engvoldsen
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/htmlgenerator.cpp1
-rw-r--r--tools/qdoc3/test/qt-html-templates.qdocconf5
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 67aa6c6..638ae94 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1849,6 +1849,7 @@ void HtmlGenerator::generateFooter(const Node *node)
out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version())
<< QString(address).replace("\\" + COMMAND_VERSION, myTree->version());
+ out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n";
out() << "</body>\n";
out() << "</html>\n";
}
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index b94bb81..534f19f 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -127,8 +127,9 @@ HTML.footer = " <!-- /div -->\n" \
" <div id=\"feedcloseX\">\n" \
" <a href=\"#\" onclick=\"\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\">X</a>\n" \
" </div>\n" \
- " <form action=\"#\">\n" \
- " <p><textarea id=\"feedbox\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \
+ " <form id=\"feedform\" action=\"feedback.php\" method=\"get\">\n" \
+ " <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \
+ " <input id=\"page\" name=\"pageVal\" value=\"\$(\'title\').html();\" style=\"display:none;\">\n" \
" <p><input id=\"feedsubmit\" type=\"submit\" onclick=\"\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\"\n" \
" name=\"feedback\" /></p>\n" \
" </form>\n" \