diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-02-04 13:22:16 +0200 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-02-11 09:10:48 +0200 |
| commit | 84c7967a6c9fc13b2e588b029030546fa6f8b92e (patch) | |
| tree | 0aced5e1a961550af1461e33f5b3925c048ed584 /examples/scxml/mediaplayer-widgets-dynamic/doc | |
| parent | 72841fe10402148de78c218d06bf1a1f3d3857d0 (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-widgets-dynamic/doc')
| -rw-r--r-- | examples/scxml/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/examples/scxml/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc b/examples/scxml/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc index 59ec84f..51d4b95 100644 --- a/examples/scxml/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc +++ b/examples/scxml/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc @@ -47,11 +47,20 @@ \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-widgets-dynamic.pro \quotefromfile mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro \skipto QT - \printuntil scxml + \printline scxml + + With cmake to the \e CMakeLists.txt + \quotefromfile mediaplayer-widgets-dynamic/CMakeLists.txt + \skipto find_package + \printline Scxml + \skipto target_link_libraries + \printuntil ) \quotefromfile mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp |