summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndre de la Rocha <andre.rocha@qt.io>2017-11-10 10:32:53 +0100
committerAndre de la Rocha <andre.rocha@qt.io>2017-11-23 15:50:32 +0000
commit3e7f827e9dd6c143772ed063a57209728cea2720 (patch)
tree62ba83965b6a8e09a97026e617e221cd468e70c4 /src
parent616207ec9783cf58661f35782fee6f8c825f205f (diff)
Add ActiveQt Media Player example
The Media Player example uses the Microsoft Media Player ActiveX control to implement a functional media player application. This example demonstrates how a Qt application can communicate with embedded ActiveX controls using signals, slots and the dynamicCall() function. Task-number: QTBUG-60636 Change-Id: Ie2f65d3d8796076b2c18d5fa561b709035a53e79 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/activeqt/doc/src/activeqt-index.qdoc1
-rw-r--r--src/activeqt/doc/src/qtaxcontainer.qdoc2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/activeqt/doc/src/activeqt-index.qdoc b/src/activeqt/doc/src/activeqt-index.qdoc
index 75f51f8..7920bdc 100644
--- a/src/activeqt/doc/src/activeqt-index.qdoc
+++ b/src/activeqt/doc/src/activeqt-index.qdoc
@@ -106,6 +106,7 @@
\li \l{Dot Net Example (ActiveQt)}
\li \l{OpenGL Example (ActiveQt)}
\li \l{Hierarchy Example (ActiveQt)}
+ \li \l{Media Player Example (ActiveQt)}
\li \l{Menus Example (ActiveQt)}
\li \l{Wrapper Example (ActiveQt)}
\li \l{Simple Example (ActiveQt)}
diff --git a/src/activeqt/doc/src/qtaxcontainer.qdoc b/src/activeqt/doc/src/qtaxcontainer.qdoc
index 264c0b2..ba73467 100644
--- a/src/activeqt/doc/src/qtaxcontainer.qdoc
+++ b/src/activeqt/doc/src/qtaxcontainer.qdoc
@@ -199,6 +199,8 @@
object and its subobjects; note that not all of the COM object's APIs
might be available.
+ See the \l{activeqt/mediaplayer}{Media Player} example for more information.
+
\section2 Calling Function Through a Script Engine
A Qt application can host any ActiveScript engine installed on the system.