qdoc: Updated the qdoc manual and its qdocconf file.

2 files changed, 95 insertions, 227 deletions

diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
index 0c303c1..9939cce 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdoc
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -27,12 +27,12 @@
 
 /*!
     \page index.html
-    \nextpage QDoc Manual
+    \nextpage Introduction
 
-    \title QDoc Manual - Table of Contents
+    \title Table of Contents
 
     \list
-    \o \l{QDoc Manual}
+    \o \l{Introduction}
     \o \l{QDoc Commands}
        \list
        \o \l{Markup Commands}
@@ -79,11 +79,11 @@
 
 /*!
     \page 01-qdoc-manual.html
-    \contentspage QDoc Manual - Table of Contents
-    \previouspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
+    \previouspage Table of Contents
     \nextpage QDoc Commands
 
-    \title QDoc Manual
+    \title Introduction
 
     QDoc is the internal tool used by Qt Development Frameworks for generating
     documentation. This document is a reference for QDoc command syntax and
@@ -165,8 +165,8 @@
 
 /*!
     \page 02-qdoc-commands.html
-    \previouspage QDoc Manual
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Introduction
+    \contentspage Table of Contents
     \nextpage Markup Commands
 
     \title QDoc Commands
@@ -196,7 +196,7 @@
 
 /*!
     \page 03-qdoc-commands-markup.html
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \previouspage QDoc Commands
     \nextpage Text Formatting Commands
 
@@ -287,7 +287,7 @@
 
 /*!
     \page 04-qdoc-commands-textformatting.html
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \previouspage Markup Commands
     \nextpage Document Structuring Commands
 
@@ -928,7 +928,7 @@
 /*!
     \page 05-qdoc-commands-documentstructuring.html
     \previouspage Text Formatting Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Verbatim Code Commands
 
     \title Document Structuring Commands
@@ -1211,7 +1211,7 @@
 /*!
     \page 06-qdoc-commands-verbatimcode.html
     \previouspage Document Structuring Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Quoting External Code Commands
 
     \title Verbatim Code Commands
@@ -1425,7 +1425,7 @@
 /*!
     \page 07-0-qdoc-commands-quoting.html
     \previouspage Verbatim Code Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Linking Commands
 
     \title Quoting External Code Commands
@@ -2097,7 +2097,7 @@
 /*!
     \page  07-1-example.html
     \previouspage Quoting External Code Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
 
     \title Example File
 
@@ -2107,7 +2107,7 @@
 /*!
     \page 08-qdoc-commands-linking.html
     \previouspage Quoting External Code Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Graphic Commands
 
     \title Linking Commands
@@ -2404,7 +2404,7 @@
 /*!
     \page 09-qdoc-commands-graphic.html
     \previouspage Linking Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Container Commands
 
     \title Graphic Commands
@@ -2606,7 +2606,7 @@
 /*!
     \page 10-qdoc-commands-container.html
     \previouspage Graphic Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Document Contents Commands
 
     \title Container Commands
@@ -3146,7 +3146,7 @@
 /*!
     \page 11-qdoc-commands-documentcontents.html
     \previouspage Container Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Miscellaneous Commands
 
     \title Document Contents Commands
@@ -3816,7 +3816,7 @@
 /*!
     \page 12-0-qdoc-commands-miscellaneous.html
     \previouspage Document Contents Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Topical Commands
 
     \title Miscellaneous Commands
@@ -4667,7 +4667,7 @@
 /*!
     \page 12-1-signalandslots.html
     \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
 
     \title signalandslots.qdocinc
 
@@ -4677,7 +4677,7 @@
 /*!
     \page 12-2-objectmodel.html
     \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
 
     \title objectmodel.qdocinc
 
@@ -4687,7 +4687,7 @@
 /*!
     \page 12-3-layoutmanagement.html
     \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
 
     \title layoutmanagement.qdocinc
 
@@ -4697,7 +4697,7 @@
 /*!
     \page 13-qdoc-commands-topical.html
     \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Contextual Commands
 
     \title Topical Commands
@@ -6035,7 +6035,7 @@
 /*!
     \page 14-qdoc-commands-contextualcommands.html
     \previouspage Topical Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Navigation Commands
 
     \title Contextual Commands
@@ -6082,7 +6082,7 @@
 /*!
     \page 15-qdoc-commands-navigation.html
     \previouspage Contextual Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Status Commands
 
     \title Navigation Commands
@@ -6315,7 +6315,7 @@
 /*!
     \page 16-qdoc-commands-status.html
     \previouspage Navigation Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Thread Support Commands
 
     \title Status Commands
@@ -6622,7 +6622,7 @@
 /*!
     \page 17-qdoc-commands-thread.html
     \previouspage Status Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Relating Commands
 
     \title Thread Support Commands
@@ -6819,7 +6819,7 @@
 /*!
     \page 18-qdoc-commands-relating.html
     \previouspage Thread Support Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Grouping Commands
 
     \title Relating Commands
@@ -6978,7 +6978,7 @@
 /*!
     \page 19-qdoc-commands-grouping.html
     \previouspage Relating Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Title Commands
 
     \title Grouping Commands
@@ -7104,7 +7104,7 @@
 /*!
     \page 20-qdoc-commands-title.html
     \previouspage Grouping Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage QDoc Configuration
 
     \title Title Commands
@@ -7208,7 +7208,7 @@
 /*!
     \page 21-0-qdoc-configuration.html
     \previouspage Title Commands
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage General Configuration Variables
 
     \title QDoc Configuration
@@ -7345,7 +7345,7 @@
 /*!
     \page 21-1-minimum-qdocconf.html
     \previouspage QDoc Configuration
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
 
     \title minimum.qdocconf
 
@@ -7355,7 +7355,7 @@
 /*!
     \page 21-2-qt-qdocconf.html
     \previouspage QDoc Configuration
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
 
     \title qt.qdocconf
 
@@ -7365,7 +7365,7 @@
 /*!
     \page 22-qdoc-configuration-generalvariables.html
     \previouspage QDoc Configuration
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Creating Help Project Files
 
     \title General Configuration Variables
@@ -8279,7 +8279,7 @@
 /*!
     \page 22-creating-help-project-files.html
     \previouspage General Configuration Variables
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage C++ Specific Configuration Variables
 
     \title Creating Help Project Files
@@ -8348,7 +8348,7 @@
 /*!
     \page 23-qdoc-configuration-cppvariables.html
     \previouspage Creating Help Project Files
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage HTML Specific Configuration Variables
 
     \title C++ Specific Configuration Variables
@@ -8486,7 +8486,7 @@
 /*!
     \page 24-qdoc-configuration-htmlvariables.html
     \previouspage C++ Specific Configuration Variables
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Supporting Derived Projects
 
     \title HTML Specific Configuration Variables
@@ -8616,7 +8616,7 @@
 /*!
     \page 25-qdoc-configuration-derivedprojects.html
     \previouspage HTML Specific Configuration Variables
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage QDoc Compatibility
 
     \title Supporting Derived Projects
@@ -8778,7 +8778,7 @@
 /*!
     \page 26-qdoc-commands-compatibility.html
     \previouspage Supporting Derived Projects
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage QDoc Commands - Alphabetical List
 
     \title QDoc Compatibility
@@ -8910,7 +8910,7 @@
 /*!
     \page 27-qdoc-commmands-alphabetical.html
     \previouspage QDoc Compatibility
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
 
     \title QDoc Commands - Alphabetical List
 
diff --git a/tools/qdoc3/doc/qdoc-manual.qdocconf b/tools/qdoc3/doc/qdoc-manual.qdocconf
index 1e7ff01..84ee2ba 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdocconf
+++ b/tools/qdoc3/doc/qdoc-manual.qdocconf
@@ -1,3 +1,6 @@
+include(../test/qt-html-default-styles.qdocconf)
+include(../test/macros.qdocconf)
+
 project          = QDoc
 description      = QDoc3 Manual
 
@@ -13,7 +16,15 @@ exampledirs     += $PWD \
 
 imagedirs       += images
 
-extraimages.HTML = qt-logo
+extraimages.HTML        = qt-logo.png \
+                          arrow_down.png \
+                          breadcrumb.png \
+                          bullet_gt.png \
+                          bullet_dn.png \
+                          bullet_sq.png \
+                          bullet_up.png \
+                          horBar.png \
+                          sprites-combined.png
 
 HTML.stylesheets        =  style/style.css \
                            style/OfflineStyle.css \
@@ -21,186 +32,56 @@ HTML.stylesheets        =  style/style.css \
                            style/style_ie8.css \
                            style/style_ie6.css
 
-HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
-                          "    <div class=\"content\"> \n" \
+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\"></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://developer.qt.nokia.com/\">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" \
-                          "      </ul>\n" \
-                          "    </div>\n" \
-                          "    <div id=\"shortCut\">\n" \
+                          "      <a href=\"index.html\">Home</a>\n" \
+			  "    </div>\n" \
+                          "    <a href=\"index.html\" class=\"qtref\"><span>QDoc User Manual</span></a>\n" \
+                          "  </div>\n" \
+                          "</div>\n" \
+                          "<div class=\"wrap\">\n" \
+                          "  <div class=\"toolbar\">\n" \
+                          "    <div class=\"breadcrumb toolblock\">\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://doc.qt.nokia.com\">ALL VERSIONS" \
-                          "        </a></li>\n" \
-                          "      </ul>\n" \
-                          "     </div>\n" \
-                          " <ul class=\"sf-menu\" id=\"narrowmenu\"> \n" \
-                          "                         <li><a href=\"#\">API Lookup</a> \n" \
-                          "                                 <ul> \n" \
-                          "                                         <li><a href=\"classes.html\">Class index</a></li> \n" \
-                          "           <li><a href=\"functions.html\">Function index</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 Declarations</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> \n" \
-                          "                                            <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li>  \n" \
-                          "                                            <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li>  \n" \
-                          "                                            <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li>  \n" \
-                          "                                            <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li>  \n" \
-                          "                                            <li><a href=\"platform-specific.html\">Platform-specific info</a></li>  \n" \
-                          "                                            <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li>  \n" \
-                          "                                            <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li>  \n" \
-                          "                      </ul> \n" \
-                          "                                 </li> \n" \
-                          "                                 <li><a href=\"#\">Examples</a> \n" \
-                          "                                         <ul> \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" \
-                          "                        </ul> \n" \
-                          "                                         </li> \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>\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\" id=\"sidebarsearch\">\n" \
-                          "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
-                          "            <fieldset>\n" \
-                          "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
-                          " <div id=\"resultdialog\"> \n" \
-                          " <a href=\"#\" id=\"resultclose\">Close</a> \n" \
-                          " <p id=\"resultlinks\" class=\"all\"><a href=\"#\" id=\"showallresults\">All</a> | <a href=\"#\" id=\"showapiresults\">API</a> | <a href=\"#\" id=\"showarticleresults\">Articles</a> | <a href=\"#\" id=\"showexampleresults\">Examples</a></p> \n" \
-                          " <p id=\"searchcount\" class=\"all\"><span id=\"resultcount\"></span><span id=\"apicount\"></span><span id=\"articlecount\"></span><span id=\"examplecount\"></span>&nbsp;results:</p> \n" \
-                          " <ul id=\"resultlist\" class=\"all\"> \n" \
-                          " </ul> \n" \
-                          " </div> \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\">Class index</a></li>\n" \
-                          "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</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 Declarations</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\">Programming with Qt</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"best-practices.html\">How-To's and Best Practices</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" \
-                          "            </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 mainContent\">\n"
+                          "  <div class=\"content mainContent\">\n"
 
 HTML.footer             = "" \
-                          "        <div class=\"feedback t_button\">\n" \
-                          "          [+] Documentation Feedback</div>\n" \
-                          "      </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" \
-                          "    <br />\n" \
-                          "    <p>\n" \
-                          "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
-                          "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
-                          "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
-                          "    <p>\n" \
-                          "      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 id=\"noteHead\">Thank you for giving your feedback.</p> <p 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>.</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 class=\"ft\">\n" \
+                          "  <span></span>\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.\n" \
+                          "  </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>\n" \
+                          "  </p>\n" \
+                          "  <br />\n" \
+                          "  <p>\n" \
+                          "    Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+                          "    Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+                          "    with the terms contained in a written agreement between you and Nokia.\n" \
+                          "  </p>\n" \
+                          "  <p>\n" \
+                          "    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.\n" \
+                          "  </p>\n" \
+                          "</div>\n" \
+                          "<div id=\"blurpage\">\n" \
+                          "</div>\n" 
 
 # This stuff is used by the Qt 4.7 doc format.
 scriptdirs              = ../../../doc/src/template/scripts
@@ -219,16 +100,3 @@ styles.HTML		= style.css \
 			  style_ie7.css \
 			  style_ie8.css
 
-# Files not referenced in any qdoc file (last four are needed by qtdemo)
-# See also extraimages.HTML
-qhp.Qt.extraFiles          = 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
-