diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-31 11:36:32 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-31 11:36:32 +0200 |
| commit | 0c439d67f567ba2e7a1b9ada4e3953e5e598f168 (patch) | |
| tree | 00801dada770fe63e3027df58d116edccfe07cfd /doc/src/frameworks-technologies | |
| parent | edd41ee5488716cf8336a7d8ea0cb3d48d0e7b14 (diff) | |
| parent | 622a27c582f859274a5b9e40c625a6fda600b7b1 (diff) | |
| download | qt4-tools-0c439d67f567ba2e7a1b9ada4e3953e5e598f168.tar.gz | |
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/frameworks-technologies')
| -rw-r--r-- | doc/src/frameworks-technologies/activeqt.qdoc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/frameworks-technologies/activeqt.qdoc b/doc/src/frameworks-technologies/activeqt.qdoc index a79430daba..b752122dad 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} |