Merge commit 'origin/4.6' into 4.6-multimedia

Conflicts:
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp

2 files changed, 24 insertions, 5 deletions

diff --git a/doc/src/frameworks-technologies/activeqt.qdoc b/doc/src/frameworks-technologies/activeqt.qdoc
index 67b9bb3..6273337 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,26 @@
     controls.
     \endlist
 
+    For more information about using ActiveX with Qt, see
+    \l{Building ActiveX servers and controls with Qt}.
+
     The ActiveQt framework consists of two modules:
 
     \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.
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 44d6ed6..2b749de 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -517,6 +517,13 @@
     This module is part of the \l{Qt Full Framework Edition} and the
     \l{Open Source Versions of Qt}.
 
+    \section1 Further Links
+
+    General overviews of XQuery and XSchema can be found in the
+    \l{Using XML Technologies} document.
+
+    An introduction to the XQuery language can be found in \l{A Short Path to XQuery}.
+
     \section1 License Information
 
     The XML Schema implementation provided by this module contains the \c xml.xsd file
@@ -855,6 +862,8 @@
     \brief The QAxContainer module is a Windows-only extension for
     accessing ActiveX controls and COM objects.
 
+    QAxServer is part of the \l{ActiveQt Framework}.
+
     \section1 License Information
 
     The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},
@@ -905,6 +914,8 @@
     \brief The QAxServer module is a Windows-only static library that
     you can use to turn a standard Qt binary into a COM server. 
 
+    QAxServer is part of the \l{ActiveQt Framework}.
+
     \section1 License Information
 
     The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},