summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-03-30 13:56:26 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-03-30 13:56:26 (GMT)
commit09ce407aaa4a00013a606bf0011faf6cbc654c72 (patch)
treef3487c2db04a3a1342d0b6b183d5c744d1a4066f /doc
parentded30f6933eb016dfac5d52e1aebce220492f514 (diff)
downloadQt-09ce407aaa4a00013a606bf0011faf6cbc654c72.zip
Qt-09ce407aaa4a00013a606bf0011faf6cbc654c72.tar.gz
Qt-09ce407aaa4a00013a606bf0011faf6cbc654c72.tar.bz2
Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
Reviewed-by: Trust Me
Diffstat (limited to 'doc')
-rw-r--r--doc/src/frameworks-technologies/activeqt.qdoc5
-rw-r--r--doc/src/modules.qdoc11
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/src/frameworks-technologies/activeqt.qdoc b/doc/src/frameworks-technologies/activeqt.qdoc
index 5e8473f..6273337 100644
--- a/doc/src/frameworks-technologies/activeqt.qdoc
+++ b/doc/src/frameworks-technologies/activeqt.qdoc
@@ -70,7 +70,10 @@
controls.
\endlist
- The ActiveQt framework consists of two frameworks:
+ 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{Using ActiveX controls and COM objects in Qt}{QAxContainer}
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)},