diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-27 20:35:53 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-27 20:35:53 +1000 |
commit | 44a8b712a52e4911b0e5ff3fee730bbe416d7ebd (patch) | |
tree | 23849e2fd6f18f5ef1ba8e1368375eb04a4b67e3 /tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf | |
parent | 7a0cdd851d8ea1e2b51d3b91dbb69a67d379b794 (diff) | |
parent | 5c02fd9c3938b7e27b087cfd731cb8eefff486d7 (diff) |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix security problem on webpage due to bad JS
Accepting predicted text using hardware keyboard replaces unwanted part
Doc: adding link to the Qt Quick Components for Symbian page.
Diffstat (limited to 'tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf')
-rw-r--r-- | tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf index 285ec27af3..02f444d12d 100644 --- a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf @@ -139,8 +139,6 @@ HTML.postpostheader = \ HTML.footer = \ " <!-- /div -->\n" \ - " <div class=\"feedback t_button\">\n" \ - " [+] Documentation Feedback</div>\n" \ " </div>\n" \ " </div>\n" \ " <div class=\"ft\">\n" \ @@ -164,13 +162,4 @@ HTML.footer = \ " Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \ " Free Documentation License version 1.3</a>\n" \ " as published by the Free Software Foundation.</p>\n" \ - " </div>\n" \ - " <div id=\"feedbackBox\">\n" \ - " <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \ - " <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \ - " <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit your feedback...</textarea></p>\n" \ - " <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \ - " </form>\n" \ - " </div>\n" \ - " <div id=\"blurpage\">\n" \ " </div>\n" |