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

1 files changed, 5 insertions, 7 deletions

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
 }