diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
--- a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf	Fri Sep 17 08:34:18 2010 +0300
+++ b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf	Mon Oct 04 01:19:32 2010 +0300
@@ -1,25 +1,168 @@
-HTML.stylesheets        = classic.css
-HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n" \
-                          "<tr>\n" \
-                          "<td align=\"left\" valign=\"top\" width=\"32\">" \
-                          "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" border=\"0\" /></a>" \
-                          "</td>\n" \
-                          "<td width=\"1\">&nbsp;&nbsp;</td>" \
-                          "<td class=\"postheader\" valign=\"center\">" \
-                          "<a href=\"http://qt.nokia.com/doc/4.7/index.html\">" \
-                          "<font color=\"#004faf\">主页</font></a>&nbsp;&middot;" \
-                          " <a href=\"http://qt.nokia.com/doc/4.7/classes.html\">" \
-                          "<font color=\"#004faf\">所有类</font></a>&nbsp;&middot;" \
-                          " <a href=\"http://qt.nokia.com/doc/4.7/functions.html\">" \
-                          "<font color=\"#004faf\">所有函数</font></a>&nbsp;&middot;" \
-                          " <a href=\"http://qt.nokia.com/doc/4.7/overviews.html\">" \
-                          "<font color=\"#004faf\">简介</font></a>" \
-                          "</td>" \
-                          "</tr></table>"
+HTML.stylesheets        =  style/style.css \
+                           style/OfflineStyle.css \
+                           style/style_ie7.css \
+                           style/style_ie8.css \
+                           style/style_ie6.css
 
-HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
-                          "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"40%\" align=\"left\">版权所有 &copy; 2010 诺基亚公司和/或其子公司</td>\n" \
-                          "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">商标</a></td>\n" \
-                          "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
-                          "</tr></table></div></address>"
+HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
+              "    <div class=\"content\"> \n" \
+              "    <div id=\"nav-logo\">\n" \
+              "      <a href=\"index.html\">Home</a></div>\n" \
+              "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+              "     <div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
+              "     <fieldset>\n" \
+              "     <input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
+              "      </fieldset>\n" \
+              "     </form></div>\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://qt.nokia.com/developer\">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" \
+              "      <ul>\n" \
+              "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \
+              "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
+              "        </a></li>\n" \
+              "      </ul>\n" \
+              "     </div>\n" \
+             " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
+            "        <li><a href=\"#\">API Lookup</a> \n" \
+            "            <ul id=\"topmenuLook\"> \n" \
+            "              <li><a href=\"classes.html\">所有类</a></li> \n" \
+            "             <li><a href=\"functions.html\">所有函数</a></li> \n" \
+            "              <li><a href=\"modules.html\">Modules</a></li> \n" \
+            "              <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+            "              <li><a href=\"qtglobal.html\">Global stuff</a></li> \n" \
+            "              <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+            "              </ul> \n" \
+            "        </li> \n" \
+            "        <li><a href=\"#\">Qt Topics</a> \n" \
+            "            <ul id=\"topmenuTopic\"> \n" \
+            "              <li><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li> \n" \
+            "              <li><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+            "              <li><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li> \n" \
+            "              <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+            "            </ul> \n" \
+            "       </li> \n" \
+            "        <li><a href=\"#\">Examples</a> \n" \
+            "            <ul id=\"topmenuexample\"> \n" \
+            "                <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+            "                <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+            "                <li><a href=\"demos.html\">Demos</a></li> \n" \
+            "                <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+            "                <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
+            "            </ul> \n" \
+            "        </li> \n" \
+            " </ul> \n" \
+              "    </div>\n" \
+              "  </div>\n" \
+              "  <div class=\"wrapper\">\n" \
+              "    <div class=\"hd\">\n" \
+              "      <span></span>\n" \
+              "    </div>\n" \
+              "    <div class=\"bd group\">\n" \
+              "      <div class=\"sidebar\">\n" \
+              "        <div class=\"searchlabel\">\n" \
+              "          Search index:</div>\n" \
+              "        <div class=\"search\">\n" \
+              "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
+              "            <fieldset>\n" \
+              "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
+              "            </fieldset>\n" \
+              "          </form>\n" \
+              "        </div>\n" \
+              "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+              "          <h2 title=\"API Lookup\"><span></span>\n" \
+              "            API Lookup</h2>\n" \
+              "          <div  id=\"list001\" class=\"list\">\n" \
+              "          <ul id=\"ul001\" >\n" \
+              "              <li class=\"defaultLink\"><a href=\"classes.html\">所有类</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"functions.html\">所有函数</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+              "            </ul> \n" \
+              "          </div>\n" \
+              "        </div>\n" \
+              "        <div class=\"box bottombar\" id=\"topics\">\n" \
+              "          <h2 title=\"Qt Topics\"><span></span>\n" \
+              "            Qt Topics</h2>\n" \
+              "          <div id=\"list002\" class=\"list\">\n" \
+              "            <ul id=\"ul002\" >\n" \
+              "              <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
+              "            </ul>  \n" \
+              "          </div>\n" \
+              "        </div>\n" \
+              "        <div class=\"box\" id=\"examples\">\n" \
+              "          <h2 title=\"Examples\"><span></span>\n" \
+              "            Examples</h2>\n" \
+              "          <div id=\"list003\" class=\"list\">\n" \
+              "        <ul id=\"ul003\">\n" \
+              "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+              "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
+              "            </ul> \n" \
+              "          </div>\n" \
+              "        </div>\n" \
+              "      </div>\n" \
+              "      <div class=\"wrap\">\n" \
+              "        <div class=\"toolbar\">\n" \
+              "          <div class=\"breadcrumb toolblock\">\n" \
+              "            <ul>\n" \
+              "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+              "              <!--  Bread crumbs goes here -->\n"
+
+HTML.postpostheader = "            </ul>\n" \
+              "          </div>\n" \
+              "          <div class=\"toolbuttons toolblock\">\n" \
+              "            <ul>\n" \
+              "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+              "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+              "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+              "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+              "                <span>Print</span></a></li>\n" \
+              "            </ul>\n" \
+              "          </div>\n" \
+              "        </div>\n" \
+              "        <div class=\"content\">\n"
+
+HTML.footer = "        <!-- /div -->\n" \
+              "        <div class=\"feedback t_button\">\n" \
+              "          [+] Documentation Feedback</div>\n" \
+              "      </div>\n" \
+              "    </div>\n" \
+              "    <div class=\"ft\">\n" \
+              "      <span></span>\n" \
+              "    </div>\n" \
+              "  </div> \n" \
+              "  <div class=\"footer\">\n" \
+              "    <p>\n" \
+              "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+              "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+              "      in Finland and/or other countries worldwide.</p>\n" \
+              "    <p>\n" \
+              "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+              "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></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"