summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@nokia.com>2010-03-11 12:27:17 (GMT)
committerVolker Hilsheimer <volker.hilsheimer@nokia.com>2010-03-25 10:30:18 (GMT)
commite38aef4eee8c6a32bd30632576aee17a3d333c2e (patch)
treee97ae969729a588ab784b5d6130c4b90c9972e8d /doc/src
parent6fad80a8da2c2714be51fc2bcae95f3a335916ca (diff)
downloadQt-e38aef4eee8c6a32bd30632576aee17a3d333c2e.zip
Qt-e38aef4eee8c6a32bd30632576aee17a3d333c2e.tar.gz
Qt-e38aef4eee8c6a32bd30632576aee17a3d333c2e.tar.bz2
Doc: Fix links in the ActiveQt framework, and also link to the tools.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/frameworks-technologies/activeqt.qdoc17
1 files changed, 11 insertions, 6 deletions
diff --git a/doc/src/frameworks-technologies/activeqt.qdoc b/doc/src/frameworks-technologies/activeqt.qdoc
index 67b9bb3..5e8473f 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.