diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-05-10 12:22:03 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-05-10 12:22:03 (GMT) |
| commit | aec71b27ccf4a9513c474bdbe9d65de5fb5fbdc1 (patch) | |
| tree | a8d3e69f8acebd9388afd83a897bb3b33057baf4 /tools | |
| parent | 147ef453d130fc7817b3b4406502b1b887ab6c79 (diff) | |
| parent | 5e07004df26cbf65a0fe0096a3417a5329f72431 (diff) | |
| download | Qt-aec71b27ccf4a9513c474bdbe9d65de5fb5fbdc1.zip Qt-aec71b27ccf4a9513c474bdbe9d65de5fb5fbdc1.tar.gz Qt-aec71b27ccf4a9513c474bdbe9d65de5fb5fbdc1.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 1 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 5 |
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 e691705..e5d73c7 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -126,8 +126,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" \ |