Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.

Reviewed-by: Trust Me

3 files changed, 19 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)},
diff --git a/src/xmlpatterns/api/qxmlresultitems.cpp b/src/xmlpatterns/api/qxmlresultitems.cpp
index c474082..98c5bdc 100644
--- a/src/xmlpatterns/api/qxmlresultitems.cpp
+++ b/src/xmlpatterns/api/qxmlresultitems.cpp
@@ -70,6 +70,10 @@ QT_BEGIN_NAMESPACE
   sequence and returns it, and current() always returns the QXmlItem
   that next() returned the last time it was called.
 
+  \note When using the QXmlResultItems overload of QXmlQuery::evaluateTo()
+  to execute a query, it is advisable to create a new instance of this
+  class for each new set of results rather than reusing an old instance.
+
   \sa QXmlItem::isNode(), QXmlItem::isAtomicValue(), QXmlNodeModelIndex
  */