summaryrefslogtreecommitdiffstats
path: root/doc/src/frameworks-technologies
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-05-20 11:49:18 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-05-20 11:49:18 (GMT)
commit1dc2235ac930c5444aa83a25432d1bf8b78b18db (patch)
tree545f4f02f5bc046828fb7a0b7ce4a2f1bdec5499 /doc/src/frameworks-technologies
parenta72c6f403435e5cc7aff501b1e1ee990dfb24969 (diff)
downloadQt-1dc2235ac930c5444aa83a25432d1bf8b78b18db.zip
Qt-1dc2235ac930c5444aa83a25432d1bf8b78b18db.tar.gz
Qt-1dc2235ac930c5444aa83a25432d1bf8b78b18db.tar.bz2
doc: Fixed many broken links.
Diffstat (limited to 'doc/src/frameworks-technologies')
-rw-r--r--doc/src/frameworks-technologies/activeqt.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/frameworks-technologies/activeqt.qdoc b/doc/src/frameworks-technologies/activeqt.qdoc
index 979d885..5a3b23e 100644
--- a/doc/src/frameworks-technologies/activeqt.qdoc
+++ b/doc/src/frameworks-technologies/activeqt.qdoc
@@ -71,16 +71,16 @@
\endlist
For more information about using ActiveX with Qt, see
- \l{Building ActiveX servers and controls with Qt}.
+ \l{Building ActiveX servers in Qt}.
The ActiveQt framework consists of two modules:
\list
- \o The \l{Using ActiveX controls and COM objects in Qt}{QAxContainer}
+ \o The \l{Using ActiveX controls and COM 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}
+ \o The \l{Building ActiveX servers in 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