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

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (35 commits)
  Fix a crash in QGtkStyle when theme not available
  Exporting QFontDatabase::removeAllApplicationFonts()
  Adding QFontDatabase::removeAllApplicationFonts()
  Fixed crash in Phonon MMF backend during application shutdown
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e9151b11e974f0aa47fd40c225f88f35ced91496 )
  Fixed bitfield-related crash on Symbian WINSCW
  Compile with MSVC 2005 and 2003 when no platform SDK is used
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c39615d8e78f083b23f34ac24cf7d3a7ce765122 )
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd724fb2f716336a8a4b54cd2edc96851a5a26a4 )
  QS60Style: very tall QSpinBox's buttons hide lineEdit
  Export QGLContextResource for use with Qt/3D
  Use QSKIP rather than commenting a failure.
  Refactor QDirectFBPixmap::fromImage slightly
  QDirectFBPixmap can handle NoOpaqueDetection.
  Reverts using composition mode when using DeviceCoordinateMode cache.
  Fix linking error
  Fix compile error on Symbian 9.1, caused in network/access.
  QInputContextFactory::languages implementation for Symbian.
  QS60Style cannot draw transparency to UI element border areas
  Changed pkg_prerules to not use default_deployment for vendor ID
  ...

1 files changed, 11 insertions, 6 deletions

diff --git a/doc/src/frameworks-technologies/activeqt.qdoc b/doc/src/frameworks-technologies/activeqt.qdoc
index e24959d..a79430d 100644
--- a/doc/src/frameworks-technologies/activeqt.qdoc
+++ b/doc/src/frameworks-technologies/activeqt.qdoc
@@ -57,6 +57,7 @@
     \brief An overview of Qt's ActiveX and COM integration on Windows.
 
     \ingroup platform-specific
+    \ingroup frameworks-technologies
     \keyword ActiveQt
 
     Qt's ActiveX and COM support allows Qt for Windows developers to:
@@ -69,19 +70,23 @@
     controls.
     \endlist
 
-    The ActiveQt framework consists of two modules:
+    The ActiveQt framework consists of two frameworks:
 
     \list
-    \o The \l QAxContainer module is a static
-       library implementing QObject and QWidget subclasses, QAxObject and
-       QAxWidget, that act as containers for COM objects and ActiveX
-       controls.
-    \o The \l QAxServer module is a static library that implements
+    \o The \l{Using ActiveX controls and COM objects in Qt}{QAxContainer}
+       module is a static library implementing QObject and QWidget subclasses,
+       QAxObject and QAxWidget, that act as containers for COM objects and
+       ActiveX controls.
+    \o The \l{Building ActiveX servers and controls with Qt}{QAxServer}
+       module is a static library that implements
        functionality for in-process and executable COM servers. This
        module provides the QAxAggregated, QAxBindable and QAxFactory
        classes.
     \endlist
 
+    A set of \l{Tools for ActiveQt}{tools} is provided to simplify the
+    developing and building of Qt projects that use ActiveX.
+
     To build the static libraries, change into the \c activeqt directory 
     (usually \c QTDIR/src/activeqt), and run \c qmake and your make
     tool in both the \c container and the \c control subdirectory.