diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:27:17 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:27:18 +0100 |
| commit | 5173ee755e9d90c44b748f57090c0df8cf9a79df (patch) | |
| tree | 508b3ed5ffa86f97109a2b9f5fec83028a687071 | |
| parent | 022d6294cb50c832d054408ea5429aaa2de0b55b (diff) | |
| parent | 279fc6ce0d6b56a9336240a549118220c9c9388d (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia6e9b1180bd3125a40bf7f244fbf4c9b0e9766a2
| -rw-r--r-- | src/activeqt/control/qaxbindable.cpp | 2 | ||||
| -rw-r--r-- | src/activeqt/doc/activeqt.qdocconf | 2 | ||||
| -rw-r--r-- | src/activeqt/doc/src/examples/dotnet.qdoc | 2 |
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 |