summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-29 14:51:25 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-29 14:51:25 (GMT)
commit9b707c0a12e01f8b0c4432b6a5d391b8699cfd3a (patch)
tree24c920bbba7bc5d2d7dedd7c5a8756376f3c7b4b /doc
parenta63298440dcddc844554e012434c3331ca239db4 (diff)
parentd51939831552ef73e8f33365c1ef77322594512c (diff)
downloadQt-9b707c0a12e01f8b0c4432b6a5d391b8699cfd3a.zip
Qt-9b707c0a12e01f8b0c4432b6a5d391b8699cfd3a.tar.gz
Qt-9b707c0a12e01f8b0c4432b6a5d391b8699cfd3a.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc')
-rw-r--r--doc/src/activeqt.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/activeqt.qdoc b/doc/src/activeqt.qdoc
index 3919823..473f815 100644
--- a/doc/src/activeqt.qdoc
+++ b/doc/src/activeqt.qdoc
@@ -82,7 +82,7 @@
Designer}.
The ActiveQt modules are part of the \l{Qt Full Framework Edition} and
- the \l{Open Source Versions}.
+ the \l{Open Source Versions of Qt}.
\sa {QAxContainer Module}, {QAxServer Module}
*/