diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 01:14:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 01:14:14 (GMT) |
| commit | 622a27c582f859274a5b9e40c625a6fda600b7b1 (patch) | |
| tree | 6f52745b6eeb479fe1d5e23ebc205661508960e3 /doc | |
| parent | 4dd2bbe5da43fe26bbe75edd27e02eefae6b82d4 (diff) | |
| parent | 880e4935410769b8337d75f219bef70493c4bb2c (diff) | |
| download | Qt-622a27c582f859274a5b9e40c625a6fda600b7b1.zip Qt-622a27c582f859274a5b9e40c625a6fda600b7b1.tar.gz Qt-622a27c582f859274a5b9e40c625a6fda600b7b1.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Add a children private property needed for QML to support QGraphicsObject"
Revert "struct -> class, it's better."
Revert "Add NOTIFY to size property so QML bindings are working fine."
Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry changes"
Revert "Add a a layout property in QGraphicsWidget."
Add a workaround for a bug in Mac filesystem watcher.
Another "off by 1" problem in OpenVG - in paths this time.
Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
Compile on MingW
struct -> class, it's better.
Add a a layout property in QGraphicsWidget.
Fix QFileSystemModel to not install useless watchers on the filesystem
Diffstat (limited to 'doc')
| -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 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)}, |