summaryrefslogtreecommitdiffstats
path: root/doc/src/qaxserver.qdoc
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-04-17 12:01:04 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2009-04-17 12:01:04 (GMT)
commit198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (patch)
treee4c99e89cbecd2084a87a8c7a5d4877385fcec1c /doc/src/qaxserver.qdoc
parentbb2e4df9bee3148e819c98410aa36e22dad95d7a (diff)
parente85867003ca1741f378b1f58f4dd9d48577a5d9b (diff)
downloadQt-198efeb27e5c2a87d0a2bb6859446cb1faf45ed8.zip
Qt-198efeb27e5c2a87d0a2bb6859446cb1faf45ed8.tar.gz
Qt-198efeb27e5c2a87d0a2bb6859446cb1faf45ed8.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations
Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'doc/src/qaxserver.qdoc')
-rw-r--r--doc/src/qaxserver.qdoc3
1 files changed, 0 insertions, 3 deletions
diff --git a/doc/src/qaxserver.qdoc b/doc/src/qaxserver.qdoc
index ff04962..f0c317b 100644
--- a/doc/src/qaxserver.qdoc
+++ b/doc/src/qaxserver.qdoc
@@ -63,9 +63,6 @@
Some \l{Qt Examples#ActiveQt}{example implementations} of ActiveX
controls and COM objects are provided.
- The QAxServer module is part of the \l{Qt Full Framework Edition} for
- Windows. It is \e not part of the \l{Open Source Versions of Qt}.
-
\sa {ActiveQt Framework}
Topics: