From cbba0a1ea1e727cca4ca09c216e4f5a306083ba4 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Tue, 7 Sep 2010 10:55:06 +0200
Subject: Doc: updating the qdocconf files and the stylesheet QDocconf files
 was out of date in the section including extra files Style now shows numbered
 lists corectly

---
 doc/src/template/style/style.css              | 17 ++++----
 tools/qdoc3/test/assistant.qdocconf           |  2 +-
 tools/qdoc3/test/designer.qdocconf            | 12 ++++--
 tools/qdoc3/test/linguist.qdocconf            | 14 +++++--
 tools/qdoc3/test/qdeclarative.qdocconf        | 58 +++++++++++++++------------
 tools/qdoc3/test/qmake.qdocconf               | 58 +++++++++++++++------------
 tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf | 12 ++----
 tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 12 ++----
 tools/qdoc3/test/qt-defines.qdocconf          |  6 ---
 tools/qdoc3/test/qt-html-templates.qdocconf   | 16 ++++++--
 tools/qdoc3/test/qt.qdocconf                  |  7 ----
 tools/qdoc3/test/qt_ja_JP.qdocconf            |  7 ----
 tools/qdoc3/test/qt_zh_CN.qdocconf            | 11 +++++
 13 files changed, 126 insertions(+), 106 deletions(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 9afff03..6cc1cb6 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -35,6 +35,10 @@
     {
         list-style: none;
     }
+    ol li
+    {
+        list-style: decimal;
+    }
     caption, th
     {
         text-align: left;
@@ -790,13 +794,12 @@
 		padding-left:12px;
     }
 
-
-
-
-
-
-
-
+    .wrap .content ol li
+    {
+	background:none;
+    margin-bottom: 10px; 
+	padding-left:0px;
+    }
 
     .content li:hover  {}
 
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 8cf5722..836c4bf 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qt Assistant
 description             = Qt Assistant Manual
-url                     = http://qt.nokia.com/doc/4.7
+url                     = http://doc.qt.nokia.com/4.7/
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index b1f37dc..9136619 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qt Designer
 description             = Qt Designer Manual
-url                     = http://qt.nokia.com/doc/4.7
+url                     = http://doc.qt.nokia.com/4.7/
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
@@ -18,6 +18,9 @@ qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
 qhp.Designer.extraFiles          = images/bg_l.png \
                              	    images/bg_l_blank.png \
+									images/bg_ll_blank.png \
+									images/bg_ul_blank.png \
+									images/header_bg.png \
                              	    images/bg_r.png \
 									images/box_bg.png \
 									images/breadcrumb.png \
@@ -25,12 +28,12 @@ qhp.Designer.extraFiles          = images/bg_l.png \
                              	    images/bullet_dn.png \
 									images/bullet_sq.png \
                              	    images/bullet_up.png \
+									images/arrow_down.png \
                              	    images/feedbackground.png \
                              	    images/horBar.png \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
-									images/arrow-down.png \
 									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
@@ -38,7 +41,10 @@ qhp.Designer.extraFiles          = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
-									style/OfflineStyle.css \
+									scripts/narrow.js \
+									scripts/superfish.js \
+									style/narrow.css \
+									style/superfish.css \
 									style/style_ie6.css \
 									style/style_ie7.css \
 									style/style_ie8.css \
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index 26fb55c..696802a 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qt Linguist
 description             = Qt Linguist Manual
-url                     = http://qt.nokia.com/doc/4.7
+url                     =  http://doc.qt.nokia.com/4.7/
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
@@ -18,6 +18,9 @@ qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
 qhp.Linguist.extraFiles          = images/bg_l.png \
                              	    images/bg_l_blank.png \
+									images/bg_ll_blank.png \
+									images/bg_ul_blank.png \
+									images/header_bg.png \
                              	    images/bg_r.png \
 									images/box_bg.png \
 									images/breadcrumb.png \
@@ -25,20 +28,23 @@ qhp.Linguist.extraFiles          = images/bg_l.png \
                              	    images/bullet_dn.png \
 									images/bullet_sq.png \
                              	    images/bullet_up.png \
+									images/arrow_down.png \
                              	    images/feedbackground.png \
                              	    images/horBar.png \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
-									images/arrow-down.png \
-s									images/spinner.gif \
+									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
-									style/OfflineStyle.css \
+									scripts/narrow.js \
+									scripts/superfish.js \
+									style/narrow.css \
+									style/superfish.css \
 									style/style_ie6.css \
 									style/style_ie7.css \
 									style/style_ie8.css \
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 80bca29..45f48a6 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -28,32 +28,38 @@ qhp.Qml.indexTitle          = Qml Reference
 # Files not referenced in any qdoc file
 # See also extraimages.HTML
 qhp.Qml.extraFiles            = images/bg_l.png \
-                             	images/bg_l_blank.png \
-				images/bg_r.png \
-				images/box_bg.png \
-				images/breadcrumb.png \
-				images/bullet_gt.png \
-                             	images/bullet_dn.png \
-				images/bullet_sq.png \
-                             	images/bullet_up.png \
-                             	images/feedbackground.png \
-                             	images/horBar.png \
-				images/page.png \
-				images/page_bg.png \
-				images/sprites-combined.png \
-				images/arrow-down.png \
-				images/spinner.png \
-                             	images/stylesheet-coffee-plastique.png \
-                             	images/taskmenuextension-example.png \
-                             	images/coloreditorfactoryimage.png \
-                             	images/dynamiclayouts-example.png \
-				scripts/functions.js \
-				scripts/jquery.js \
-				style/OfflineStyle.css \
-				style/style_ie6.css \
-				style/style_ie7.css \
-				style/style_ie8.css \
-                             	style/style.css
+                             images/bg_l_blank.png \
+							 images/bg_ll_blank.png \
+							 images/bg_ul_blank.png \
+							 images/header_bg.png \
+                             images/bg_r.png \
+                             images/box_bg.png \
+                             images/breadcrumb.png \
+                             images/bullet_gt.png \
+                             images/bullet_dn.png \
+                             images/bullet_sq.png \
+                             images/bullet_up.png \
+                             images/arrow_down.png \
+                             images/feedbackground.png \
+                             images/horBar.png \
+                             images/page.png \
+                             images/page_bg.png \
+                             images/sprites-combined.png \
+                             images/spinner.gif \
+                             images/stylesheet-coffee-plastique.png \
+                             images/taskmenuextension-example.png \
+                             images/coloreditorfactoryimage.png \
+                             images/dynamiclayouts-example.png \
+                             scripts/functions.js \
+                             scripts/jquery.js \
+                             scripts/narrow.js \
+                             scripts/superfish.js \
+                             style/narrow.css \
+                             style/superfish.css \
+                             style/style_ie6.css \
+                             style/style_ie7.css \
+                             style/style_ie8.css \
+                             style/style.css
 
 qhp.Qml.filterAttributes    = qt 4.7.0 qtrefdoc
 qhp.Qml.customFilters.Qt.name = Qt 4.7.0
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index f069129..8125166 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -17,32 +17,38 @@ qhp.qmake.namespace           = com.trolltech.qmake.470
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
 qhp.qmake.extraFiles          = images/bg_l.png \
-                             	    images/bg_l_blank.png \
-                             	    images/bg_r.png \
-									images/box_bg.png \
-									images/breadcrumb.png \
-									images/bullet_gt.png \
-                             	    images/bullet_dn.png \
-									images/bullet_sq.png \
-                             	    images/bullet_up.png \
-                             	    images/feedbackground.png \
-									images/horBar.png \
-									images/page.png \
-									images/page_bg.png \
-									images/sprites-combined.png \
-									images/arrow-down.png \
-									images/spinner.gif \
-                             	    images/stylesheet-coffee-plastique.png \
-                             	    images/taskmenuextension-example.png \
-                             	   images/coloreditorfactoryimage.png \
-                             	   images/dynamiclayouts-example.png \
-									scripts/functions.js \
-									scripts/jquery.js \
-									style/OfflineStyle.css \
-									style/style_ie6.css \
-									style/style_ie7.css \
-									style/style_ie8.css \
-                             	    style/style.css
+                             images/bg_l_blank.png \
+							 images/bg_ll_blank.png \
+							 images/bg_ul_blank.png \
+							 images/header_bg.png \
+                             images/bg_r.png \
+                             images/box_bg.png \
+                             images/breadcrumb.png \
+                             images/bullet_gt.png \
+                             images/bullet_dn.png \
+                             images/bullet_sq.png \
+                             images/bullet_up.png \
+                             images/arrow_down.png \
+                             images/feedbackground.png \
+                             images/horBar.png \
+                             images/page.png \
+                             images/page_bg.png \
+                             images/sprites-combined.png \
+                             images/spinner.gif \
+                             images/stylesheet-coffee-plastique.png \
+                             images/taskmenuextension-example.png \
+                             images/coloreditorfactoryimage.png \
+                             images/dynamiclayouts-example.png \
+                             scripts/functions.js \
+                             scripts/jquery.js \
+                             scripts/narrow.js \
+                             scripts/superfish.js \
+                             style/narrow.css \
+                             style/superfish.css \
+                             style/style_ie6.css \
+                             style/style_ie7.css \
+                             style/style_ie8.css \
+                             style/style.css
 
 qhp.qmake.filterAttributes    = qt 4.7.0 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
diff --git a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
index 7701cae..e0bb630 100644
--- a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
@@ -32,6 +32,9 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 qhp.Qt.extraFiles          = index.html \
                              images/bg_l.png \
                              images/bg_l_blank.png \
+							 images/bg_ll_blank.png \
+							 images/bg_ul_blank.png \
+							 images/header_bg.png \
                              images/bg_r.png \
                              images/box_bg.png \
                              images/breadcrumb.png \
@@ -39,12 +42,12 @@ qhp.Qt.extraFiles          = index.html \
                              images/bullet_dn.png \
                              images/bullet_sq.png \
                              images/bullet_up.png \
+                             images/arrow_down.png \
                              images/feedbackground.png \
                              images/horBar.png \
                              images/page.png \
                              images/page_bg.png \
                              images/sprites-combined.png \
-                             images/arrow-down.png \
                              images/spinner.gif \
                              images/stylesheet-coffee-plastique.png \
                              images/taskmenuextension-example.png \
@@ -52,17 +55,10 @@ qhp.Qt.extraFiles          = index.html \
                              images/dynamiclayouts-example.png \
                              scripts/functions.js \
                              scripts/jquery.js \
-                             scripts/shBrushCpp.js \
-                             scripts/shCore.js \
-                             scripts/shLegacy.js \
                              scripts/narrow.js \
                              scripts/superfish.js \
-                             style/shCore.css \
-                             style/shThemeDefault.css \
                              style/narrow.css \
                              style/superfish.css \
-                             style/superfish_skin.css \
-                             style/OfflineStyle.css \
                              style/style_ie6.css \
                              style/style_ie7.css \
                              style/style_ie8.css \
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index be459d8..297c6eb 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -32,6 +32,9 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 qhp.Qt.extraFiles          = index.html \
                              images/bg_l.png \
                              images/bg_l_blank.png \
+							 images/bg_ll_blank.png \
+							 images/bg_ul_blank.png \
+							 images/header_bg.png \
                              images/bg_r.png \
                              images/box_bg.png \
                              images/breadcrumb.png \
@@ -39,12 +42,12 @@ qhp.Qt.extraFiles          = index.html \
                              images/bullet_dn.png \
                              images/bullet_sq.png \
                              images/bullet_up.png \
+                             images/arrow_down.png \
                              images/feedbackground.png \
                              images/horBar.png \
                              images/page.png \
                              images/page_bg.png \
                              images/sprites-combined.png \
-                             images/arrow-down.png \
                              images/spinner.gif \
                              images/stylesheet-coffee-plastique.png \
                              images/taskmenuextension-example.png \
@@ -52,17 +55,10 @@ qhp.Qt.extraFiles          = index.html \
                              images/dynamiclayouts-example.png \
                              scripts/functions.js \
                              scripts/jquery.js \
-                             scripts/shBrushCpp.js \
-                             scripts/shCore.js \
-                             scripts/shLegacy.js \
                              scripts/narrow.js \
                              scripts/superfish.js \
-                             style/shCore.css \
-                             style/shThemeDefault.css \
                              style/narrow.css \
                              style/superfish.css \
-                             style/superfish_skin.css \
-                             style/OfflineStyle.css \
                              style/style_ie6.css \
                              style/style_ie7.css \
                              style/style_ie8.css \
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index 344bbb0..51ee0d3 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -49,20 +49,14 @@ scriptdirs              = $QT_SOURCE_TREE/doc/src/template/scripts
 styledirs               = $QT_SOURCE_TREE/doc/src/template/style
 
 scripts.HTML		= functions.js \
-			     shBrushCpp.js \
-			     shCore.js \
-			     shLegacy.js \
 			     narrow.js \
 			     superfish.js \
 			  jquery.js
 
 styles.HTML		= style.css \
-			     shCore.css \
-			     shThemeDefault.css \
 			     narrow.css \
 			     superfish.css \
 			     superfish_skin.css \
-				 OfflineStyle.css \
 			  style_ie6.css \
 			  style_ie7.css \
 			  style_ie8.css
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index ed5ee17..1203357 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -164,12 +164,22 @@ HTML.footer             = "        <!-- /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 id=\"noteHead\">Thank you for giving your feedback.</p> <div class=\"note\"><p>Make sure it is related to this specific page. For more general bugs and \n" \
-			  "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p></div>\n" \
+			  "      <p id=\"noteHead\">Thank you for giving your feedback. <div class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
+			  "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</div></p>\n" \
 			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></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" \
 			  "  <!--/div -->\n" \
-                          "  </div>\n"
+			  "<script type=\"text/javascript\">\n" \
+			  "  var _gaq = _gaq || [];\n" \
+			  "  _gaq.push([\'_setAccount\', \'UA-4457116-5\']);\n" \
+			  "  _gaq.push([\'_trackPageview\']);\n" \
+			  "  (function() {\n" \
+			  "    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;\n" \
+			  "    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';\n" \
+			  "    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);\n" \
+			  "  })();\n" \
+			  "</script>\n"
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index f78bd38..4f0d159 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -50,17 +50,10 @@ qhp.Qt.extraFiles          = index.html \
                  images/dynamiclayouts-example.png \
                  scripts/functions.js \
                  scripts/jquery.js \
-                 scripts/shBrushCpp.js \
-                 scripts/shCore.js \
-                 scripts/shLegacy.js \
                  scripts/narrow.js \
                  scripts/superfish.js \
-                 style/shCore.css \
-                 style/shThemeDefault.css \
                  style/narrow.css \
                  style/superfish.css \
-                 style/superfish_skin.css \
-                 style/OfflineStyle.css \
                  style/style_ie6.css \
                  style/style_ie7.css \
                  style/style_ie8.css \
diff --git a/tools/qdoc3/test/qt_ja_JP.qdocconf b/tools/qdoc3/test/qt_ja_JP.qdocconf
index d4141c7..f9ce142 100644
--- a/tools/qdoc3/test/qt_ja_JP.qdocconf
+++ b/tools/qdoc3/test/qt_ja_JP.qdocconf
@@ -57,17 +57,10 @@ qhp.Qt.extraFiles          = index.html \
 			    images/dynamiclayouts-example.png \
 			    scripts/functions.js \
 			    scripts/jquery.js \
-			    scripts/shBrushCpp.js \
-			    scripts/shCore.js \
-			    scripts/shLegacy.js \
 			    scripts/narrow.js \
 			    scripts/superfish.js \
-			    style/shCore.css \
-			    style/shThemeDefault.css \
 			    style/narrow.css \
 			    style/superfish.css \
-			    style/superfish_skin.css \
-			    style/OfflineStyle.css \
 			    style/style_ie6.css \
 			    style/style_ie7.css \
 			    style/style_ie8.css \
diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf
index 4983f9e..5bf8171 100644
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt_zh_CN.qdocconf
@@ -34,6 +34,9 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 qhp.Qt.extraFiles          = index.html \
                              images/bg_l.png \
                              images/bg_l_blank.png \
+							 images/bg_ll_blank.png \
+							 images/bg_ul_blank.png \
+							 images/header_bg.png \
                              images/bg_r.png \
                              images/box_bg.png \
                              images/breadcrumb.png \
@@ -41,6 +44,7 @@ qhp.Qt.extraFiles          = index.html \
                              images/bullet_dn.png \
                              images/bullet_sq.png \
                              images/bullet_up.png \
+                             images/arrow_down.png \
                              images/feedbackground.png \
                              images/horBar.png \
                              images/page.png \
@@ -53,6 +57,13 @@ qhp.Qt.extraFiles          = index.html \
                              images/dynamiclayouts-example.png \
                              scripts/functions.js \
                              scripts/jquery.js \
+                             scripts/narrow.js \
+                             scripts/superfish.js \
+                             style/narrow.css \
+                             style/superfish.css \
+                             style/style_ie6.css \
+                             style/style_ie7.css \
+                             style/style_ie8.css \
                              style/style.css
 
 language                = Cpp
-- 
cgit v0.12