summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Buhr <andreas@andreasbuhr.de>2020-12-03 14:18:39 +0100
committerAndreas Buhr <andreas@andreasbuhr.de>2020-12-04 12:37:09 +0100
commitf83ed6bd6b49d0837f620101738d837a62646a1d (patch)
treef9e5ed0dfba148894c719693b8bcc06b7d01d430 /src
parentc01111deb8c0cd53502a278b848dcc980c608d62 (diff)
Fix two documentation warnings
Remove link to Qt Script as it is not maintained any more. Add documentation stub for control() function as others link to it. Task-number: QTBUG-88533 Change-Id: I94d5f2186431eb49fbe5e33e794bb9793be95699 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/activeqt/container/qaxbase.cpp3
-rw-r--r--src/activeqt/doc/src/examples/dotnet.qdoc4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 8c70fe1..e97dd91 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -921,6 +921,9 @@ bool QAxBase::setControl(const QString &c)
return true;
}
+/*!
+ Returns the ActiveX control.
+*/
QString QAxBase::control() const
{
return d->ctrl;
diff --git a/src/activeqt/doc/src/examples/dotnet.qdoc b/src/activeqt/doc/src/examples/dotnet.qdoc
index 5fe1466..d9f09af 100644
--- a/src/activeqt/doc/src/examples/dotnet.qdoc
+++ b/src/activeqt/doc/src/examples/dotnet.qdoc
@@ -305,9 +305,7 @@
in the APIs can only be those supported by ActiveQt and COM. However,
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 {Qt Script} to automate
- Qt applications and to COM clients in general.
+ available to .NET.
When using the "IJW" method, in principle the only limitation is the
time required to write the wrapper classes and data type conversion