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: (23 commits)
  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
  Enable armcc version specific compler options for Symbian
  Fix another off-by-1 error in OpenVG image painting.
  Fix OpenVG build on non-Symbian platforms.
  QNAM HTTP: Symbian compile fix
  tst_qnetworkreply: Fix side effect, add another test
  QNAM HTTP: Fix crazy crash when exiting application
  Correct documentation for ObjectReplacementCharacter and ReplacementCh.
  Prevents a useless repaint with QGraphicsItem cache mode.
  Fix for submenu placement for QMenus in Symbian.
  Symbian event loop priority drop not used in Symbian^4
  QMessageBox is smaller than native MessageBox
  Doc: Fix links in the ActiveQt framework, and also link to the tools.
  ...

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.