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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (354 commits)
  Clean up rasterfallback mechanism in DirectFB
  QNAM HTTP: Fix crash related to aborted uploads
  Destroy the old runtime system only when existing pixmaps were migrated.
  Fixed autotest failure in tst_qgl::clipTest.
  Properly emit geometryChanged() when the position change.
  Make bld.inf target in Symbian mkspecs to depend on .pro file
  Fixed build failure
  Added way to destroy the share widget in the GL graphics system.
  QCoreApplication::library path, ensure mutex lock ordering
  Fix memory leak.
  QAudioOutput(ALSA); Fix check for available devices.
  qdoc: All references to -assistant and -base were removed.
  Only modify pixmap cache reply when protected by a mutex
  Fix broken example code
  Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
  update Russian translations for Qt and tools
  Updated Slovenian translations for Qt 4.7
  doc: The QML Qt element was missing from the documentation.
  Added documentation for Spectrum Analyzer demo
  Do not include Spectrum Analyzer demo in static builds
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index a1773a3..1c35a63 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -55,15 +55,14 @@
 
     These pages are about Qt's traditional set of GUI components for
     building both native look ^ feel and custom UI's for the desktop
-    environment. Use \l {declarativeui.html} {Qt Quick} for building 
-    UI's for mobile devices.
+    environment. Use \l{Qt Quick} for building UI's for mobile devices.
 
     \generatelist {related}
  */
 
 /*!
     \group qt-graphics
-    \title Qt Graphics and Painting
+    \title Qt Graphics and Printing
 
     \brief The Qt components for doing graphics.
 
@@ -91,11 +90,12 @@
 
 /*!
   \group qt-activex
-  \title Qt For ActiveX
-  \brief Qt API's for using ActiveX controls, servers, and COM.
+  \title ActiveX in Qt
   \ingroup technology-apis
   \ingroup platform-specific
 
+  \brief Qt API's for using ActiveX controls, servers, and COM.
+
   These pages document Qt's API's for developing with ActiveX
   controls, servers, and COM.
 
@@ -104,7 +104,7 @@
 
 /*!
   \group qt-sql
-  \title Using SQL in Qt
+  \title SQL in Qt
   \brief Qt API's for using SQL.
   \ingroup technology-apis
   \ingroup best-practices