summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorKavindra Devi Palaraja <kavindra.palaraja@nokia.com>2009-04-20 13:47:41 (GMT)
committerKavindra Devi Palaraja <kavindra.palaraja@nokia.com>2009-04-20 13:47:41 (GMT)
commit68d6a91fd2db9ec95d9f46e7af10eff7da89f8f0 (patch)
tree9e3b0b9ce2cc397a49d1d4de4ff5b738c9f77620 /doc/src
parent0b14582aa47e1c255e1bbd68ef5ced2e69ec31a8 (diff)
downloadQt-68d6a91fd2db9ec95d9f46e7af10eff7da89f8f0.zip
Qt-68d6a91fd2db9ec95d9f46e7af10eff7da89f8f0.tar.gz
Qt-68d6a91fd2db9ec95d9f46e7af10eff7da89f8f0.tar.bz2
Doc - Mentioned that ActiveQt is now part of the Open source versions
of Qt. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/activeqt.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/activeqt.qdoc b/doc/src/activeqt.qdoc
index ea13e59..3919823 100644
--- a/doc/src/activeqt.qdoc
+++ b/doc/src/activeqt.qdoc
@@ -73,7 +73,7 @@
To build the static libraries, change into the \c activeqt directory
(usually \c QTDIR/src/activeqt), and run \c qmake and your make
tool in both the \c container and the \c control subdirectory.
- The libraries \c qaxcontainer.lib and \c qaxserver.lib will be linked
+ The libraries \c qaxcontainer.lib and \c qaxserver.lib will be linked
into \c QTDIR/lib.
If you are using a shared configuration of Qt enter the \c plugin
@@ -81,8 +81,8 @@
plugin that integrates the QAxContainer module into \l{Qt
Designer}.
- The ActiveQt modules are part of the \l{Qt Full Framework Edition}. They
- are \e not part of the \l{Open Source Versions of Qt}.
+ The ActiveQt modules are part of the \l{Qt Full Framework Edition} and
+ the \l{Open Source Versions}.
\sa {QAxContainer Module}, {QAxServer Module}
*/