Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	mkspecs/features/qt.prf
	src/corelib/animation/qanimationgroup.cpp
	src/corelib/animation/qparallelanimationgroup.cpp
	src/corelib/animation/qpauseanimation.cpp
	src/corelib/animation/qpropertyanimation.cpp
	src/corelib/animation/qsequentialanimationgroup.cpp
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/qeasingcurve.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/opengl/opengl.pro
	src/opengl/qgl_x11egl.cpp
	tests/auto/auto.pro

4 files changed, 17 insertions, 21 deletions

diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 601d0bc..da5b2f0 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -1265,9 +1265,7 @@ void DocParser::parse(const QString& source,
                         }
                         else {
                             append(Atom::ParaLeft);
-                            append(Atom::String,
-                                   "This is an overloaded member function, "
-                                   "provided for convenience.");
+                            append(Atom::String,"This is an overloaded function.");
                             append(Atom::ParaRight);
                             x = getMetaCommandArgument(cmdStr);
                         }
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index fd1a2e6..c2d2d22 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2386,23 +2386,19 @@ void HtmlGenerator::generateSectionList(const Section& section,
 
             if (name_alignment) {
                 out() << "<tr><td class=\"memItemLeft\" "
-                      << "nowrap align=\"right\" valign=\"top\">";
+                      << "align=\"right\" valign=\"top\">";
             }
             else {
                 if (twoColumn && i == (int) (section.members.count() + 1) / 2)
                     out() << "</ul></td><td valign=\"top\"><ul>\n";
-                out() << "<li><div class=\"fn\"></div>";
+                out() << "<li><div class=\"fn\">";
             }
 
-            if (style == CodeMarker::Accessors)
-                out() << "<b>";
             generateSynopsis(*m, relative, marker, style, name_alignment);
-            if (style == CodeMarker::Accessors)
-                out() << "</b>";
             if (name_alignment)
                 out() << "</td></tr>\n";
             else
-                out() << "</li>\n";
+                out() << "</div></li>\n";
             i++;
             ++m;
         }
@@ -2467,8 +2463,10 @@ void HtmlGenerator::generateSynopsis(const Node *node,
     marked.replace("<@param>", "<i>");
     marked.replace("</@param>", "</i>");
 
-    if (style == CodeMarker::Summary)
-        marked.replace("@name>", "b>");
+    if (style == CodeMarker::Summary) {
+        marked.replace("<@name>", "");   // was "<b>"
+        marked.replace("</@name>", "");  // was "</b>"
+    }
 
     if (style == CodeMarker::SeparateList) {
         QRegExp extraRegExp("<@extra>.*</@extra>");
@@ -3290,7 +3288,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node,
         section.members += property->resetters();
 
         if (!section.members.isEmpty()) {
-            out() << "<p>Access functions:</p>\n";
+            out() << "<p><b>Access functions:</b></p>\n";
             generateSectionList(section, node, marker, CodeMarker::Accessors);
         }
     }
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 3e6f832..5c247fa 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -43,6 +43,7 @@
   main.cpp
 */
 
+#include <qglobal.h>
 #include <QtCore>
 #include <stdlib.h>
 #include "apigenerator.h"
@@ -136,7 +137,8 @@ static void printHelp()
  */
 static void printVersion()
 {
-    Location::information(tr("qdoc version 4.4.1"));
+    QString s = QString(tr("qdoc version ")) + QString(QT_VERSION_STR);
+    Location::information(s);
 }
 
 /*!
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index c35c633..aef6c5d 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -1,9 +1,6 @@
 BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
   font-family: Arial, Geneva, Helvetica, sans-serif;
 }
-BODY,TD {
-  font-size: 90%;
-}
 H1 {
   text-align: center;
   font-size: 160%;
@@ -86,6 +83,7 @@ table td.memItemLeft {
   border-left-style: none;
   background-color: #FAFAFA;
   font-size: 80%;
+  white-space: nowrap
 }
 table td.memItemRight {
   padding: 1px 8px 0px 8px;
@@ -127,10 +125,10 @@ table.annotated td {
 
 table tr pre
 {
-  padding-top: none;
-  padding-bottom: none;
-  padding-left: none;
-  padding-right: none;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  padding-left: 0px;
+  padding-right: 0px;
   border: none;
   background: none
 }