summaryrefslogtreecommitdiffstats
path: root/examples/scxml/mediaplayer-qml-dynamic/doc
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-02-04 13:22:16 +0200
committerJuha Vuolle <juha.vuolle@insta.fi>2021-02-11 09:10:48 +0200
commit84c7967a6c9fc13b2e588b029030546fa6f8b92e (patch)
tree0aced5e1a961550af1461e33f5b3925c048ed584 /examples/scxml/mediaplayer-qml-dynamic/doc
parent72841fe10402148de78c218d06bf1a1f3d3857d0 (diff)
Qt6 related documentation changes for scxml module
Some perhaps less-obvious changes are: -Remove nonexistent imagedirs reference in qdocconf -Address some qdoc warnings (“/“ usage in an example and also std::function handling) -Fix ftpclient example filename references -Mark an escaped Q_OBJECT usage as badcode to suppress qdoc warning The Q_OBJECT itself cannot be unescaped as automoc will then fail. It shouldn't but that is the case. -Change the examples’ CMakeLists.txt to use single-line find_packages to ensure packages are not mixed and matched. Probability for problems is low but perhaps since these are examples that is appropriate Pick-to: 6.1 Task-number: QTBUG-89833 Change-Id: Ibf518aa71971e8e9d0af1b49c7de86fd28089e96 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples/scxml/mediaplayer-qml-dynamic/doc')
-rw-r--r--examples/scxml/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc13
1 files changed, 11 insertions, 2 deletions
diff --git a/examples/scxml/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc b/examples/scxml/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc
index 22d3ea2..e981290 100644
--- a/examples/scxml/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc
+++ b/examples/scxml/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc
@@ -47,14 +47,23 @@
\section1 Dynamically Loading the State Machine
We link against the Qt SCXML module by adding the following line to the
- example \e .pro file:
+ project build files.
+
+ With qmake to the \e mediaplayer-qml-dynamic.pro
\quotefromfile mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro
\skipto QT
\printline scxml
+ With cmake to the \e CMakeLists.txt
+ \quotefromfile mediaplayer-qml-dynamic/CMakeLists.txt
+ \skipto find_package
+ \printline Scxml
+ \skipto target_link_libraries
+ \printuntil )
+
We dynamically create the state machine in
- \e mediaplayer-common\Mediaplayer.qml:
+ \e {mediaplayer-common\\Mediaplayer.qml:}
\quotefromfile mediaplayer-common/Mediaplayer.qml
\skipto import QtScxml