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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page
  Doc: updating details on Tier 2 platforms
  Doc: adding remark on release of qt quick element support in creator
  Doc: updating the qdocconf files and the stylesheet
  Replaced QWeakPointer to *Pointer in QGestureManager.
  Fixed hiding a window on X11 before it was shown.
  Fix incorrect license header.

4 files changed, 17 insertions, 14 deletions

diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 77856ec..edb4d1e 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -77,7 +77,7 @@
                 <ul>
                     <li><a href="qtquick.html">Qt Quick</a></li>
                     <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
-                    <li><a href="qdeclarativeelements.html">QML Elements</a></li>
+                    <li><a href="qmlelements.html">QML Elements</a></li>
                     <li><a href="qdeclarativeexamples.html">QML Examples and Demos</a></li>
                 </ul>
               </div>
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 6e9fb3d..83cd89b 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -85,11 +85,10 @@
 
     \section1 Tier 2 Platforms
 
-    Tier 2 platforms are subjected to our unit test suite and other internal testing
-    tools prior to release of new product versions.  Qt users should note, however,
-    that errors may be present in released product versions for Tier 2 platforms and,
-    subject to resource availability, known errors in Tier 2 platforms may or may not
-    be corrected prior to new version releases.
+    Tier 2 platforms are subject to ad hoc and internal testing. However, Qt users
+	should note that errors may be present in released product versions for Tier 2
+	platforms and, subject to resource availability, known errors in Tier 2 platforms
+	may or may not be corrected prior to new version releases.
 
     \table
     \header \o Platform
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index a88b326..8684ad2 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -475,7 +475,8 @@
     \i Qt Creator has been improved to support interactive editing of
     QML UIs through drag-and-drop. The text editor supports the QML
     syntax and provides authoring assistance such as auto-completion,
-    error lookup, help lookup and easy preview of QML UI's.
+    error lookup, help lookup and easy preview of QML UI's. The Qt
+	Quick features in Qt Creator will be released with Qt Creator 2.1
     \endlist
 
     \section1 Network Bearer Management
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 9afff03..6cc1cb6 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -35,6 +35,10 @@
     {
         list-style: none;
     }
+    ol li
+    {
+        list-style: decimal;
+    }
     caption, th
     {
         text-align: left;
@@ -790,13 +794,12 @@
 		padding-left:12px;
     }
 
-
-
-
-
-
-
-
+    .wrap .content ol li
+    {
+	background:none;
+    margin-bottom: 10px; 
+	padding-left:0px;
+    }
 
     .content li:hover  {}