diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-12-13 16:54:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-13 16:59:31 +0100 |
| commit | 6ae90daa2821de23cce365406c7910f0bb08e251 (patch) | |
| tree | 03d4a08ced4b8d13395c4d3e22d185755fbf929a | |
| parent | 9d4ecf37491b9391335d43e33869cb476adb0cfd (diff) | |
Doc: Enabled linking to Active Qt documentation.
-also listed the module as an Add-On.
Task-number: QTBUG-28042
Change-Id: I275e9de481790380028f565b6afc7c5f1922a6ff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
| -rw-r--r-- | doc/config/qtdoc-project.qdocconf | 1 | ||||
| -rw-r--r-- | doc/src/modules.qdoc | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/config/qtdoc-project.qdocconf b/doc/config/qtdoc-project.qdocconf index 6f4e86918..659a5cfa2 100644 --- a/doc/config/qtdoc-project.qdocconf +++ b/doc/config/qtdoc-project.qdocconf @@ -4,6 +4,7 @@ url = http://qt-project.org/doc/qtdoc version = 5.0.0 depends += \ + activeqt \ qtassistant \ qt3d \ qtbluetooth \ diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 5d65b163a..1dad9cb82 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -116,6 +116,11 @@ \li Target Platforms \li Description \row + \li \l{Active Qt} + \li Windows + \li + \li Classes for applications which use ActiveX and COM + \row \li \l{Qt Concurrent} \li \li |