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

Conflicts:
	src/gui/graphicsview/qgraphicswidget.cpp
	src/gui/painting/qdrawutil.cpp
	src/gui/painting/qpainterpath.cpp
	tools/qdoc3/test/qt-cpp-ignore.qdocconf
	tools/qdoc3/test/qt-inc.qdocconf

1 files changed, 40 insertions, 36 deletions

diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index d8c3d33..79bcb80 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -17,7 +17,7 @@ h3.fn,span.fn
   background-color: #eee;
   border-width: 1px;
   border-style: solid;
-  border-color: #ddd #ddd #ddd #ddd ;
+  border-color: #ddd;
   font-weight: bold;
   padding: 6px 0px 6px 10px;
   margin: 42px 0px 0px 0px;
@@ -25,7 +25,7 @@ h3.fn,span.fn
 
 hr {
   border: 0;
-  color: #9E9E9E;
+  color: #a0a0a0;
   background-color: #ccc;
   height: 1px;
   width: 100%;
@@ -33,29 +33,44 @@ hr {
   margin: 34px 0px 34px 0px;
 }
 
-table {
+table.valuelist {
 	border-width: 1px 1px 1px 1px;
 	border-style: solid;
 	border-color: #dddddd;
 	border-collapse: collapse;
 	background-color: #f0f0f0;
-    margin-left: 1.5%;
-    width: 97%
 }
 
-table th {
+table.indextable {
+	border-width: 1px 1px 1px 1px;
+	border-collapse: collapse;
+	background-color: #f0f0f0;
+    border-color:#555;    
+}
+
+
+table.valuelist th {
 	border-width: 1px 1px 1px 2px;
 	padding: 4px;
 	border-style: solid;
+	border-color: #666;
+    color:white;
+    background-color:#666;
+}
+
+th.titleheader  {
+	border-width: 1px 0px 1px 0px;
+	padding: 4px;
+	border-style: solid;
 	border-color: #444;
     color:white;
-    background-color:#444;
+    background-color:#555555;
 }
 
 p {
-  margin-left: 1.5%;
+
+  margin-left: 4px;
   margin-top: 8px;
-  width: 97%
   margin-bottom: 8px;
 }
 
@@ -101,42 +116,31 @@ body
   color: black
 }
 
+table.generic, table.annotated
+{
+  border-width: 1px;
+  border-color:#bbb;
+  border-style:solid;  
+  border-collapse:collapse;
+}
+
 table td.memItemLeft {
-  width: 200px;
+  width: 160px;
   padding: 2px 0px 0px 8px;
   margin: 4px;
-  border-top-width: 1px;
-  border-right-width: 1px;
-  border-bottom-width: 1px;
-  border-left-width: 1px;
-  border-top-color: #E0E0E0;
-  border-right-color: #E0E0E0;
-  border-bottom-color: #E0E0E0;
-  border-left-color: #E0E0E0;
-  border-top-style: none;
-  border-right-style: none;
-  border-bottom-style: none;
-  border-left-style: none;
-  background-color: #FAFAFA;
+  border-width: 1px;
+  border-color: #E0E0E0;
+  border-style: none;
   font-size: 100%;
   white-space: nowrap
 }
+
 table td.memItemRight {
   padding: 2px 8px 0px 8px;
   margin: 4px;
-  border-top-width: 1px;
-  border-right-width: 1px;
-  border-bottom-width: 1px;
-  border-left-width: 1px;
-  border-top-color: #E0E0E0;
-  border-right-color: #E0E0E0;
-  border-bottom-color: #E0E0E0;
-  border-left-color: #E0E0E0;
-  border-top-style: none;
-  border-right-style: none;
-  border-bottom-style: none;
-  border-left-style: none;
-  background-color: #FAFAFA;
+  border-width: 1px;
+  border-color: #E0E0E0;
+  border-style: none;
   font-size: 100%;
 }