Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
  qdoc: Added next and previous links to top of pages.
  Doc: style tuning
  Doc: fixing style - tool buttons to bold.
  Doc: updating the template to support search feature better.
  Doc: Fixing columns to display all elements in lists - css3
  Doc: fixing bugs in style
  Doc: fixing style for search display and slim fit menus
  Doc: Fixing bug in sorting script for search results.
  Doc: Fixed basic language.
  Doc: Added Windows Vista to the trademark list.
  Doc: Updated the Java trademark information.
  Doc: Moved QFileSystemModel example code to the class documentation.
  Doc: Corrected the name property as it was incorrectly declared.

2 files changed, 34 insertions, 4 deletions

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 7b719c8..fb04175 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1929,10 +1929,8 @@ void HtmlGenerator::generateHeader(const QString& title,
         }
     }
 
-#if 0 // Removed for new doc format. MWS
     if (node && !node->links().empty())
-        out() << "<p>\n" << navigationLinks << "</p>\n";
-#endif    
+        out() << "<p>\n" << navigationLinks << "</p><p/>\n";
 }
 
 void HtmlGenerator::generateTitle(const QString& title,
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 47b1e5f..30a63c8 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -9,6 +9,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\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" \
@@ -26,6 +27,37 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "        </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" \
 			  "    </div>\n" \
 			  "  </div>\n" \
 			  "  <div class=\"wrapper\">\n" \
@@ -36,7 +68,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "      <div class=\"sidebar\">\n" \
 			  "        <div class=\"searchlabel\">\n" \
 			  "          Search index:</div>\n" \
-			  "        <div class=\"search\">\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" \