Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (21 commits)
  Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus"
  Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
  Fix problem with grabWindow on Mac OS X 10.6 with Cocoa
  Added an additional check to workaround an issue on Windows.
  don't crash when destroying children
  Fix compile issue with Mac OS X 10.5
  Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus
  Exact word bubble doesn't disappear when screen is tapped (fix part 2)
  Fix QPixmap::grabWindow() on Mac OS X Lion
  Update 4.7.4 changes
  Exact word bubble doesn't disappear when screen is tapped
  Make text rendering working outside the gui thread on Symbian.
  Doc: Clarified the range of return values from QLineF::angle().
  Doc: Fixed \since declarations.
  Doc: Standardized on QtQuick for \since declarations.
  Doc: Removed whitespace.
  Modified \since command behavior slightly to handle project and version.
  Doc: Added a simple introduction to Qt and fixed links.
  Doc: Added more appropriate links to help reduce confusion.
  Doc: Removed non-ASCII characters from the documentation.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index af418e0..bebd41a 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -38,7 +38,7 @@
             \list
             \o \l{Qt Features Overview}
             \o \l{How to Learn Qt}
-            \o \l{Introduction to Qt Quick}
+            \o \l{Introduction to Qt Quick}{Qt Quick}
             \o \l{external: Qt Mobility Manual}{Qt Mobility}
             \o \l{Qt WebKit}
             \endlist