diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-31 09:36:32 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-31 09:36:32 (GMT) |
| commit | 0c439d67f567ba2e7a1b9ada4e3953e5e598f168 (patch) | |
| tree | 00801dada770fe63e3027df58d116edccfe07cfd /doc/src | |
| parent | edd41ee5488716cf8336a7d8ea0cb3d48d0e7b14 (diff) | |
| parent | 622a27c582f859274a5b9e40c625a6fda600b7b1 (diff) | |
| download | Qt-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.zip Qt-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.tar.gz Qt-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
configure
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.h
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/frameworks-technologies/activeqt.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/modules.qdoc | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/src/frameworks-technologies/activeqt.qdoc b/doc/src/frameworks-technologies/activeqt.qdoc index a79430d..b752122 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 76a52b4..b13861f 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -493,6 +493,13 @@ \snippet doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc 1 + \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 @@ -810,6 +817,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)}, @@ -860,6 +869,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)}, |