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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits)
  qdoc: Avoid infinite loops in table of contents generation.
  Removed the documentation from the install rule.
  qdoc: Added the <othermeta> element.
  qdoc: Completed changing <section> structure.
  Doc: Fixed reference to absolete API in exceptionsafety.html
  Doc: Removed links to obsolete API in QResource
  Doc: Fixed broken links in QIcon::fromTheme()
  Doc: Fixed doc bug in undo framework example
  Doc: Fixed typo.
  qdoc: Changed <section> structure.
  Doc: Typo fixes
  Doc: Fixed snippet documenting QMetaObject::classInfo
  Doc: Cannot alter SelectionMode of a combobox's view
  qdoc: Added <publisher> and <permissions> elements.
  qdoc: Added <component> element to contain the module name.
  qdoc: Added <prodinfo> element and its contents to the metadata.
  Doc: Fixed a doc bug in the Rogue example
  Doc: Small change to QByteArray::resize()
  Doc: Small change to ListModel docs
  Doc: QtDemo now gives error message when example doc cannot be loaded
  ...

1 files changed, 191 insertions, 8 deletions

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index df2729c..4071145 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -7,7 +7,7 @@
         color: #000000;
         background: #FFFFFF;
     }
-    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
+    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, th, td
     {
         margin: 0;
         padding: 0;
@@ -146,13 +146,13 @@
     }
     th
     {
-        padding: 5px 15px 5px 15px;
+        padding: 5px 15px 5px 10px;
         background-color: #E1E1E1;
         border-left: 1px solid #E6E6E6;
     }
     td
     {
-        padding: 3px 15px 3px 20px;
+        padding: 3px 15px 3px 10px;
     }
     tr.odd td:hover,  tr.even td:hover    {}
 
@@ -185,10 +185,165 @@
     {
         float: right; margin-left: 2em
     }
+    div.clear-both
+    {
+        clear: both 
+    }
+    div.clear-left
+    {
+        clear: left 
+    }
+    div.clear-right
+    {
+        clear: right 
+    }
 
+    #color-white
+    {
+        background: #ffffff; 
+        color: #000000;
+    }
+    #color-black
+    {
+        background: #000000;
+        color: #ffffff;
+    }
+    #color-red
+    {
+        background: #ff0000;
+        color: #000000;
+    }
+    #color-darkRed
+    {
+        background: #800000;
+        color: #ffffff;
+    }
+    #color-green
+    {
+        background: #00ff00;
+        color: #000000;
+    }
+    #color-darkGreen
+    {
+        background: #008000;
+        color: #ffffff;
+    }
+    #color-blue
+    {
+        background: #0000ff;
+        color: #ffffff;
+    }
+    #color-darkBlue
+    {
+        background: #000080;
+        color: #ffffff;
+    }
+    #color-cyan
+    {
+        background: #00ffff;
+        color: #000000;
+    }
+    #color-darkCyan
+    {
+        background: #008080;
+        color: #ffffff;
+    }
+    #color-magenta
+    {
+        background: #ff00ff;
+        color: #000000;
+    }
+    #color-darkMagenta
+    {
+        background: #800080;
+        color: #ffffff;
+    }
+    #color-yellow
+    {
+        background: #ffff00;
+        color: #000000;
+    }
+    #color-darkYellow
+    {
+        background: #808000;
+        color: #ffffff;
+    }
+    #color-gray
+    {
+        background: #a0a0a4;
+        color: #000000;
+    }
+    #color-darkGray
+    {
+        background: #808080;
+        color: #ffffff;
+    }
+    #color-lightGray
+    {
+        background: #c0c0c0;
+        color: #000000;
+    }
+    #QtGuiColor
+    {
+      background-color: #98fd00;
+      color: black;
+    }
+    #QtCoreColor
+    {
+      background-color: #9c9cff;
+      color: black;
+    }
+    #DefaultColor
+    {
+      background-color: #f6f6dc;
+      color: black;
+    }
+    #FreetypeColor
+    {
+      background-color: #e6e6fa;
+      color: black;
+    }
+    #GLColor
+    {
+      background-color: #ffc0cb;
+      color: black;
+    }
+    #PthreadColor
+    {
+      background-color: #bdb76b;
+      color: black;
+    }
+    #OptionalColor
+    {
+      background-color: #cae1ff;
+      color: black;
+    }
+    #SMColor
+    {
+      background-color: #c2fafa;
+      color: black;
+    }
+    #MiscColor
+    {
+      background-color: #f0f9ff;
+      color: black;
+    }
+    #GlibColor
+    {
+      background-color: #b3b3b3;
+      color: black;
+    }
+    .figCaption
+    {
+      color:#363534;
+      font:italic 11px/1.2 Verdana;
+      text-align: center;
+      padding-top:0;
+    }
     span.comment
     {
         color: #008B00;
+        font-style: italic
     }
     span.string, span.char
     {
@@ -1030,11 +1185,28 @@
         padding:0px;
     }
 
-    .content .alignedsummary
-    {
-        margin: 15px;
-    }
-
+        .content .alignedsummary
+        {
+          margin: 15px;
+        }
+
+        .details
+        {
+            text-align: left;
+            font-size: 80%;
+            color: blue
+        }
+        .variableName
+        {
+            font-family: courier;
+	    color: blue
+        }
+        .newStuff
+        {
+            text-align: left;
+            font-size: 80%;
+            color: red
+        }
 
     .qmltype
     {
@@ -1381,6 +1553,10 @@
         font: normal bold 13px/1 Verdana;
     }
 
+    .content .normallist li
+    {
+        font: normal 13px/1 Verdana;
+    }
     .indexbox a:hover, .indexbox a:visited:hover
     {
         color: #4c0033;
@@ -1417,6 +1593,13 @@
         background: url(../images/sprites-combined.png) no-repeat -111px -376px;
         padding: 0;
     }
+    .indexbox.tools .indexIcon2
+    {
+        width: 115px;
+        height: 137px;
+        background: url(../images/sprites-combined.png) no-repeat -111px -376px;
+        padding: 0;
+    }
     .indexboxcont:after
     {
         content: ".";