Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-html-templates.qdocconf
	tools/qdoc3/test/qt.qdocconf

10 files changed, 260 insertions, 61 deletions

diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 42d2193..51afb69 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -16,7 +16,46 @@ qhp.Assistant.file                = assistant.qhp
 qhp.Assistant.namespace           = com.trolltech.assistant.480
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
-qhp.Assistant.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
+qhp.Assistant.extraFiles          = images/api_examples.png \
+                             	    images/api_lookup.png \
+                             	    images/api_topics.png \
+                             	    images/bg_l_blank.png \
+			     	    images/bg_ll_blank.png \
+                             	    images/bg_ll.png \
+                             	    images/bg_l.png \
+                             	    images/bg_lr.png \
+                             	    images/bg_r.png \
+                             	    images/bg_ul_blank.png \
+                             	    images/bg_ul.png \
+                             	    images/bg_ur_blank.png \
+                             	    images/bg_ur.png \
+			     	    images/box_bg.png \
+                             	    images/breadcrumb.png \
+                             	    images/bullet_dn.png \
+                             	    images/bullet_gt.png \
+                             	    images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/coloreditorfactoryimage.png \
+                             	    images/content_bg.png \
+                             	    images/dynamiclayouts-example.png \
+                             	    images/feedbackground.png \
+                             	    images/form_bg.png \
+                             	    images/horBar.png \
+                             	    images/page_bg.png \
+                             	    images/print.png \
+                             	    images/qt_guide.png \
+                             	    images/qt_icon.png \
+                             	    images/qt-logo.png \
+                             	    images/qt_ref_doc.png \
+                             	    images/qt_tools.png \
+                             	    images/sep.png \
+                             	    images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+			     	    scripts/functions.js \
+			     	    scripts/jquery.js \
+                             	    style/style.css
+
 qhp.Assistant.filterAttributes    = qt 4.8.0 tools assistant
 qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
 qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index cf85e58..23b6c78 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -16,7 +16,45 @@ qhp.Designer.file                = designer.qhp
 qhp.Designer.namespace           = com.trolltech.designer.470
 qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
-qhp.Designer.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
+qhp.Designer.extraFiles          = images/api_examples.png \
+                             	   images/api_lookup.png \
+                             	   images/api_topics.png \
+                             	   images/bg_l_blank.png \
+			     	   images/bg_ll_blank.png \
+                             	   images/bg_ll.png \
+                             	   images/bg_l.png \
+                             	   images/bg_lr.png \
+                             	   images/bg_r.png \
+                             	   images/bg_ul_blank.png \
+                             	   images/bg_ul.png \
+                             	   images/bg_ur_blank.png \
+                             	   images/bg_ur.png \
+			     	   images/box_bg.png \
+                             	   images/breadcrumb.png \
+                             	   images/bullet_dn.png \
+                             	   images/bullet_gt.png \
+                             	   images/bullet_sq.png \
+                             	   images/bullet_up.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/content_bg.png \
+                             	   images/dynamiclayouts-example.png \
+                             	   images/feedbackground.png \
+                             	   images/form_bg.png \
+                             	   images/horBar.png \
+                             	   images/page_bg.png \
+                             	   images/print.png \
+                             	   images/qt_guide.png \
+                             	   images/qt_icon.png \
+                             	   images/qt-logo.png \
+                             	   images/qt_ref_doc.png \
+                             	   images/qt_tools.png \
+                             	   images/sep.png \
+                             	   images/sprites-combined.png \
+                             	   images/stylesheet-coffee-plastique.png \
+                             	   images/taskmenuextension-example.png \
+			     	   scripts/functions.js \
+			     	   scripts/jquery.js \
+                             	   style/style.css
 qhp.Designer.filterAttributes    = qt 4.8.0 tools designer
 qhp.Designer.customFilters.Designer.name = Qt Designer Manual
 qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index 697ae6f..4936bc9 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -16,7 +16,45 @@ qhp.Linguist.file                = linguist.qhp
 qhp.Linguist.namespace           = com.trolltech.linguist.480
 qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
-qhp.Linguist.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
+qhp.Linguist.extraFiles          = images/api_examples.png \
+                             	   images/api_lookup.png \
+                             	   images/api_topics.png \
+                             	   images/bg_l_blank.png \
+			     	   images/bg_ll_blank.png \
+                             	   images/bg_ll.png \
+                             	   images/bg_l.png \
+                             	   images/bg_lr.png \
+                             	   images/bg_r.png \
+                             	   images/bg_ul_blank.png \
+                             	   images/bg_ul.png \
+                             	   images/bg_ur_blank.png \
+                             	   images/bg_ur.png \
+			     	   images/box_bg.png \
+                             	   images/breadcrumb.png \
+                             	   images/bullet_dn.png \
+                             	   images/bullet_gt.png \
+                             	   images/bullet_sq.png \
+                             	   images/bullet_up.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/content_bg.png \
+                             	   images/dynamiclayouts-example.png \
+                             	   images/feedbackground.png \
+                             	   images/form_bg.png \
+                             	   images/horBar.png \
+                             	   images/page_bg.png \
+                             	   images/print.png \
+                             	   images/qt_guide.png \
+                             	   images/qt_icon.png \
+                             	   images/qt-logo.png \
+                             	   images/qt_ref_doc.png \
+                             	   images/qt_tools.png \
+                             	   images/sep.png \
+                             	   images/sprites-combined.png \
+                             	   images/stylesheet-coffee-plastique.png \
+                             	   images/taskmenuextension-example.png \
+			     	   scripts/functions.js \
+			     	   scripts/jquery.js \
+                             	   style/style.css
 qhp.Linguist.filterAttributes    = qt 4.8.0 tools linguist
 qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
 qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 03514c1..80050e3 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -27,8 +27,45 @@ qhp.Qml.indexTitle          = Qml Reference
 
 # Files not referenced in any qdoc file
 # See also extraimages.HTML
-qhp.Qml.extraFiles          = classic.css \
-                             images/qt-logo.png
+qhp.Qml.extraFiles            = images/api_examples.png \
+                             	images/api_lookup.png \
+                             	images/api_topics.png \
+                             	images/bg_l_blank.png \
+			     	images/bg_ll_blank.png \
+                             	images/bg_ll.png \
+                             	images/bg_l.png \
+                             	images/bg_lr.png \
+                             	images/bg_r.png \
+                             	images/bg_ul_blank.png \
+                             	images/bg_ul.png \
+                             	images/bg_ur_blank.png \
+                             	images/bg_ur.png \
+			     	images/box_bg.png \
+                             	images/breadcrumb.png \
+                             	images/bullet_dn.png \
+                             	images/bullet_gt.png \
+                             	images/bullet_sq.png \
+                             	images/bullet_up.png \
+                             	images/coloreditorfactoryimage.png \
+                             	images/content_bg.png \
+                             	images/dynamiclayouts-example.png \
+                             	images/feedbackground.png \
+                             	images/form_bg.png \
+                             	images/horBar.png \
+                             	images/page_bg.png \
+                             	images/print.png \
+                             	images/qt_guide.png \
+                             	images/qt_icon.png \
+                             	images/qt-logo.png \
+                             	images/qt_ref_doc.png \
+                             	images/qt_tools.png \
+                             	images/sep.png \
+                             	images/sprites-combined.png \
+                             	images/stylesheet-coffee-plastique.png \
+                             	images/taskmenuextension-example.png \
+			     	scripts/functions.js \
+			     	scripts/jquery.js \
+                             	style/style.css
 
 qhp.Qml.filterAttributes    = qt 4.6.0 qtrefdoc
 qhp.Qml.customFilters.Qt.name = Qt 4.6.0
@@ -63,19 +100,3 @@ imagedirs               = $QT_SOURCE_TREE/doc/src/images \
 outputdir               = $QT_BUILD_TREE/doc-build/html-qml
 tagfile                 = $QT_BUILD_TREE/doc-build/html-qml/qt.tags
 base                    = file:$QT_BUILD_TREE/doc/html-qml
-
-HTML.stylesheets        = classic.css
-
-HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n" \
-                          "<tr>\n" \
-                          "<td align=\"left\" valign=\"top\">" \
-                          "<img src=\"images/qt-logo.png\" align=\"left\" border=\"0\"/>" \
-                          "</td>\n" \
-                          "<td width=\"1\">&nbsp;&nbsp;</td>" \
-                          "<td class=\"postheader\" valign=\"center\" align=\"left\">" \
-                          "<a href=\"qmlreference.html\">" \
-                          "<font color=\"#004faf\">Home</font></a>&nbsp;&middot;" \
-                          " <a href=\"qmlelements.html\">" \
-                          "<font color=\"#004faf\">Elements</font></a>" \
-                          "</td>\n" \
-                          "</tr></table>"
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index af1b13d..5c7cc29 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -16,7 +16,46 @@ qhp.qmake.file                = qmake.qhp
 qhp.qmake.namespace           = com.trolltech.qmake.480
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
-qhp.qmake.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
+qhp.qmake.extraFiles          = images/api_examples.png \
+                             	images/api_lookup.png \
+                             	images/api_topics.png \
+                             	images/bg_l_blank.png \
+			     	images/bg_ll_blank.png \
+                             	images/bg_ll.png \
+                             	images/bg_l.png \
+                             	images/bg_lr.png \
+                             	images/bg_r.png \
+                             	images/bg_ul_blank.png \
+                             	images/bg_ul.png \
+                             	images/bg_ur_blank.png \
+                             	images/bg_ur.png \
+			     	images/box_bg.png \
+                             	images/breadcrumb.png \
+                             	images/bullet_dn.png \
+                             	images/bullet_gt.png \
+                             	images/bullet_sq.png \
+                             	images/bullet_up.png \
+                             	images/coloreditorfactoryimage.png \
+                             	images/content_bg.png \
+                             	images/dynamiclayouts-example.png \
+                             	images/feedbackground.png \
+                             	images/form_bg.png \
+                             	images/horBar.png \
+                             	images/page_bg.png \
+                             	images/print.png \
+                             	images/qt_guide.png \
+                             	images/qt_icon.png \
+                             	images/qt-logo.png \
+                             	images/qt_ref_doc.png \
+                             	images/qt_tools.png \
+                             	images/sep.png \
+                             	images/sprites-combined.png \
+                             	images/stylesheet-coffee-plastique.png \
+                             	images/taskmenuextension-example.png \
+			     	scripts/functions.js \
+			     	scripts/jquery.js \
+                             	style/style.css
+
 qhp.qmake.filterAttributes    = qt 4.8.0 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 24db29f..7165c24 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -22,14 +22,12 @@ qhp.Qt.indexTitle          = Qt Reference Documentation
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             style/style.css \
-			     scripts/functions.js \
-			     scripts/jquery.js \
                              images/api_examples.png \
                              images/api_lookup.png \
                              images/api_topics.png \
-                             images/bg_ll.png \
                              images/bg_l_blank.png \
+			     images/bg_ll_blank.png \
+                             images/bg_ll.png \
                              images/bg_l.png \
                              images/bg_lr.png \
                              images/bg_r.png \
@@ -37,24 +35,33 @@ qhp.Qt.extraFiles          = index.html \
                              images/bg_ul.png \
                              images/bg_ur_blank.png \
                              images/bg_ur.png \
+			     images/box_bg.png \
                              images/breadcrumb.png \
                              images/bullet_dn.png \
                              images/bullet_gt.png \
+                             images/bullet_sq.png \
+                             images/bullet_up.png \
+                             images/coloreditorfactoryimage.png \
+                             images/content_bg.png \
+                             images/dynamiclayouts-example.png \
                              images/feedbackground.png \
                              images/form_bg.png \
                              images/horBar.png \
                              images/page_bg.png \
                              images/print.png \
                              images/qt_guide.png \
+                             images/qt_icon.png \
                              images/qt-logo.png \
                              images/qt_ref_doc.png \
                              images/qt_tools.png \
                              images/sep.png \
                              images/sprites-combined.png \
+                             images/stylesheet-coffee-plastique.png \
                              images/taskmenuextension-example.png \
-                             images/coloreditorfactoryimage.png \
-                             images/dynamiclayouts-example.png \
-                             images/stylesheet-coffee-plastique.png
+			     scripts/functions.js \
+			     scripts/jquery.js \
+                             style/style.css
+
 
 
 qhp.Qt.filterAttributes    = qt 4.8.0 qtrefdoc
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index 73ca4ac..5cbb146 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -30,14 +30,12 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.0
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             style/style.css \
-			     scripts/functions.js \
-			     scripts/jquery.js \
                              images/api_examples.png \
                              images/api_lookup.png \
                              images/api_topics.png \
-                             images/bg_ll.png \
                              images/bg_l_blank.png \
+			     images/bg_ll_blank.png \
+                             images/bg_ll.png \
                              images/bg_l.png \
                              images/bg_lr.png \
                              images/bg_r.png \
@@ -45,24 +43,32 @@ qhp.Qt.extraFiles          = index.html \
                              images/bg_ul.png \
                              images/bg_ur_blank.png \
                              images/bg_ur.png \
+			     images/box_bg.png \
                              images/breadcrumb.png \
                              images/bullet_dn.png \
                              images/bullet_gt.png \
+                             images/bullet_sq.png \
+                             images/bullet_up.png \
+                             images/coloreditorfactoryimage.png \
+                             images/content_bg.png \
+                             images/dynamiclayouts-example.png \
                              images/feedbackground.png \
                              images/form_bg.png \
                              images/horBar.png \
                              images/page_bg.png \
                              images/print.png \
                              images/qt_guide.png \
+                             images/qt_icon.png \
                              images/qt-logo.png \
                              images/qt_ref_doc.png \
                              images/qt_tools.png \
                              images/sep.png \
                              images/sprites-combined.png \
+                             images/stylesheet-coffee-plastique.png \
                              images/taskmenuextension-example.png \
-                             images/coloreditorfactoryimage.png \
-                             images/dynamiclayouts-example.png \
-                             images/stylesheet-coffee-plastique.png
+			     scripts/functions.js \
+			     scripts/jquery.js \
+                             style/style.css
 
 language                = Cpp
 
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 215fdf8..01cae68 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -2,7 +2,7 @@ HTML.stylesheets        = style/style.css
 HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    <div id=\"nav-logo\">\n" \
 			  "      <a href=\"index.html\">Home</a></div>\n" \
-			  "    <a href=\"#\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
 			  "    <div id=\"nav-topright\">\n" \
 			  "      <ul>\n" \
 			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
@@ -16,8 +16,8 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    </div>\n" \
 			  "    <div id=\"shortCut\">\n" \
 			  "      <ul>\n" \
-			  "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">VERSION 4.8</a></span></li>\n" \
-			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL QT VERSIONS" \
+			  "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.8</a></span></li>\n" \
+			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL Qt VERSIONS" \
 			  "        </a></li>\n" \
 			  "      </ul>\n" \
 			  "    </div>\n" \
@@ -73,9 +73,9 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "            <ul>\n" \
 			  "              <li><a href=\"examples.html\">All examples</a></li>\n" \
 			  "              <li><a href=\"tutorials.html\">All tutorials</a></li>\n" \
-			  "              <li><a href=\"#\">Qt Quick examples</a></li>\n" \
-			  "              <li><a href=\"#\">Desktop examples</a></li>\n" \
-			  "              <li><a href=\"#\">Device examples</a></li>\n" \
+			  "              <li><a href=\"examples.html\">Qt Quick examples</a></li>\n" \
+			  "              <li><a href=\"examples.html\">Desktop examples</a></li>\n" \
+			  "              <li><a href=\"examples.html\">Device examples</a></li>\n" \
 			  "            </ul>\n" \
 			  "          </div>\n" \
 			  "          <div class=\"live\">\n" \
@@ -96,7 +96,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\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" \
-			  "                <img src=\"images/sep.png\" /><img id=\"printIcon\" src=\"images/print.png\" alt=\"Print this page\" /></a></li>\n" \
+			  "                <img src=\"images/sep.png\" alt=\"\" /><img id=\"printIcon\" src=\"images/print.png\" alt=\"Print this page\" /></a></li>\n" \
 			  "            </ul>\n" \
 			  "          </div>\n" \
 			  "        </div>\n" \
@@ -110,21 +110,20 @@ HTML.footer             = "        </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" \
+			  "      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" \
-			  "    <form action=\"#\">\n" \
 			  "      <div id=\"feedcloseX\">\n" \
 			  "        <a href=\"#\" onclick=\"\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\">X</a>\n" \
 			  "      </div>\n" \
+			  "    <form action=\"#\">\n" \
 			  "      <textarea id=\"feedbox\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea>\n" \
 			  "      <input id=\"feedsubmit\" type=\"submit\" onclick=\"\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\"\n" \
 			  "        name=\"feedback\" />\n" \
@@ -132,7 +131,6 @@ HTML.footer             = "        </div>\n" \
 			  "  </div>\n" \
 			  "  <div id=\"blurpage\">\n" \
 			  "  </div>\n" \
-			  "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \
 			  "<script type=\"text/javascript\">\n" \
 			  "  var _gaq = _gaq || [];\n" \
 			  "  _gaq.push([\'_setAccount\', \'UA-4457116-5\']);\n" \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 3bb03b9..7c0ed86 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -9,6 +9,7 @@ versionsym              =
 version                 = %VERSION%
 description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.8
+online			= true
 
 sourceencoding          = UTF-8
 outputencoding          = UTF-8
@@ -25,14 +26,12 @@ qhp.Qt.indexRoot           =
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             style/style.css \
-			     scripts/functions.js \
-			     scripts/jquery.js \
                              images/api_examples.png \
                              images/api_lookup.png \
                              images/api_topics.png \
-                             images/bg_ll.png \
                              images/bg_l_blank.png \
+			     images/bg_ll_blank.png \
+                             images/bg_ll.png \
                              images/bg_l.png \
                              images/bg_lr.png \
                              images/bg_r.png \
@@ -40,24 +39,32 @@ qhp.Qt.extraFiles          = index.html \
                              images/bg_ul.png \
                              images/bg_ur_blank.png \
                              images/bg_ur.png \
+			     images/box_bg.png \
                              images/breadcrumb.png \
                              images/bullet_dn.png \
                              images/bullet_gt.png \
+                             images/bullet_sq.png \
+                             images/bullet_up.png \
+                             images/coloreditorfactoryimage.png \
+                             images/content_bg.png \
+                             images/dynamiclayouts-example.png \
                              images/feedbackground.png \
                              images/form_bg.png \
                              images/horBar.png \
                              images/page_bg.png \
                              images/print.png \
                              images/qt_guide.png \
+                             images/qt_icon.png \
                              images/qt-logo.png \
                              images/qt_ref_doc.png \
                              images/qt_tools.png \
                              images/sep.png \
                              images/sprites-combined.png \
+                             images/stylesheet-coffee-plastique.png \
                              images/taskmenuextension-example.png \
-                             images/coloreditorfactoryimage.png \
-                             images/dynamiclayouts-example.png \
-                             images/stylesheet-coffee-plastique.png
+			     scripts/functions.js \
+			     scripts/jquery.js \
+                             style/style.css
 
 qhp.Qt.filterAttributes    = qt 4.8.0 qtrefdoc
 qhp.Qt.customFilters.Qt.name = Qt 4.8.0
diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf
index 45a945e..f6d6fad 100644
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt_zh_CN.qdocconf
@@ -32,14 +32,12 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.0
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             style/style.css \
-			     scripts/functions.js \
-			     scripts/jquery.js \
                              images/api_examples.png \
                              images/api_lookup.png \
                              images/api_topics.png \
-                             images/bg_ll.png \
                              images/bg_l_blank.png \
+			     images/bg_ll_blank.png \
+                             images/bg_ll.png \
                              images/bg_l.png \
                              images/bg_lr.png \
                              images/bg_r.png \
@@ -47,24 +45,32 @@ qhp.Qt.extraFiles          = index.html \
                              images/bg_ul.png \
                              images/bg_ur_blank.png \
                              images/bg_ur.png \
+			     images/box_bg.png \
                              images/breadcrumb.png \
                              images/bullet_dn.png \
                              images/bullet_gt.png \
+                             images/bullet_sq.png \
+                             images/bullet_up.png \
+                             images/coloreditorfactoryimage.png \
+                             images/content_bg.png \
+                             images/dynamiclayouts-example.png \
                              images/feedbackground.png \
                              images/form_bg.png \
                              images/horBar.png \
                              images/page_bg.png \
                              images/print.png \
                              images/qt_guide.png \
+                             images/qt_icon.png \
                              images/qt-logo.png \
                              images/qt_ref_doc.png \
                              images/qt_tools.png \
                              images/sep.png \
                              images/sprites-combined.png \
+                             images/stylesheet-coffee-plastique.png \
                              images/taskmenuextension-example.png \
-                             images/coloreditorfactoryimage.png \
-                             images/dynamiclayouts-example.png \
-                             images/stylesheet-coffee-plastique.png
+			     scripts/functions.js \
+			     scripts/jquery.js \
+                             style/style.css
 
 language                = Cpp