summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2013-12-31 17:41:14 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-09 14:41:09 +0100
commit279fc6ce0d6b56a9336240a549118220c9c9388d (patch)
treea06a4d4e2d1a176157d4541ab0379cedd8476e49
parent0d29579baffd4f31a3ec39590117f4fee821694d (diff)
Doc: Fix broken links and "Cannot find base function" errors
"qtgui" dependency is not needed, but others are. Change-Id: I883f0c3dd2c41b9073231bae5b1eccffc76e140c Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--src/activeqt/control/qaxbindable.cpp2
-rw-r--r--src/activeqt/doc/activeqt.qdocconf2
-rw-r--r--src/activeqt/doc/src/examples/dotnet.qdoc2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/activeqt/control/qaxbindable.cpp b/src/activeqt/control/qaxbindable.cpp
index 291cec0..23f6244 100644
--- a/src/activeqt/control/qaxbindable.cpp
+++ b/src/activeqt/control/qaxbindable.cpp
@@ -252,7 +252,7 @@ bool QAxBindable::writeData(QIODevice *sink)
in your subclass (unless you use QPointer), as the QWidget can
be destroyed by the ActiveQt framework at any time.
- \sa QAxBindable, QAxFactory, {Qt's ActiveX Framework (ActiveQt)}
+ \sa QAxBindable, QAxFactory, {Active Qt}
*/
/*!
diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf
index 79c0d20..3dedff3 100644
--- a/src/activeqt/doc/activeqt.qdocconf
+++ b/src/activeqt/doc/activeqt.qdocconf
@@ -32,7 +32,7 @@ qhp.ActiveQt.subprojects.qaxserverclasses.sortPages = true
tagfile = ../../../doc/activeqt/activeqt.tags
-depends += qtcore qtgui qtdoc
+depends += qtcore qtdesigner qtdoc qtopengl qtscript qtwidgets
headerdirs += ..
diff --git a/src/activeqt/doc/src/examples/dotnet.qdoc b/src/activeqt/doc/src/examples/dotnet.qdoc
index 9a2e270..b7f856c 100644
--- a/src/activeqt/doc/src/examples/dotnet.qdoc
+++ b/src/activeqt/doc/src/examples/dotnet.qdoc
@@ -306,7 +306,7 @@
since this includes subclasses of QObject and QWidget we can wrap
any of our datatypes into a QObject subclass to make its API
available to .NET. This has the positive side effect that the same
- API is automatically available when using \l QtScript to automate
+ API is automatically available when using \l {Qt Script} to automate
Qt applications and to COM clients in general.
When using the "IJW" method, in principle the only limitation is the