diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-10-17 16:57:22 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@theqtcompany.com> | 2016-10-18 07:57:43 +0000 |
| commit | bc406fd34657c45f98f9c540ddb51576b9bf503a (patch) | |
| tree | f9b28daa81bcace496c67d49a493c147483fdb38 | |
| parent | c115efa68705a1dac419a8852f4b4b77ec43fb32 (diff) | |
Add links to Qt SCXML to appropriate places
Change-Id: I8f4aa2290567dbe28cce03198953db0ef6514392
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| -rw-r--r-- | doc/src/core.qdoc | 11 | ||||
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/doc/src/core.qdoc b/doc/src/core.qdoc index 2cb142a57..985ceadf0 100644 --- a/doc/src/core.qdoc +++ b/doc/src/core.qdoc @@ -44,9 +44,16 @@ such as a meta-object system which allows run-time introspection, manipulation, and invocation of properties and methods in the object. It also serves as the basis for Qt's event system, which is a low-level way of communicating between QObject-based objects. Another high-level form of communication is provided in -Qt's signals and slots mechanism. These features can also be used in combination +Qt's signals and slots mechanism. + +These features can also be used in combination with the State Machine Framework which provides a formally defined and -predictable way of managing the states of your application. In addition, QObject +predictable way of managing the states of your application. +An alternative way of implementing state machines is using the +\l{Qt SCXML Overview}{Qt SCXML} add-on module to create them from State Chart +XML (SCXML) files. + +In addition, QObject provides a simple timing mechanism with \l QObject::startTimer(). Alternatively, the QTimer class provides a high-level interface for timers. diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index 3b5724be4..75cfb4e79 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -44,7 +44,7 @@ a consistent look and feel. Custom layouts provide more control over the positions and sizes of child widgets. - These \l{Qt Examples and Tutorials}{Qt Examples} demonstrate various + These \l{Qt Examples and Tutorials}{Qt Examples} demonstrate various ways of setting widgets in layouts. \list @@ -248,6 +248,9 @@ \li \l{statemachine/trafficlight}{Traffic Light}\raisedaster \li \l{statemachine/twowaybutton}{Two-way Button}\raisedaster \endlist + + For more information about using the Qt SCXML module to to create state + charts from State Chart XML (SCXML) files, see \l {Qt SCXML Examples}. */ /*! |