diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-03-18 12:45:51 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-03-22 15:00:53 +0000 |
| commit | c070eb7e43a3111b2ca1cfc2084394d3a11a75a5 (patch) | |
| tree | 5273b4e6e33d2af7e6225d0af1854d07ac601094 /examples/scxml/trafficlight-qml-dynamic | |
| parent | 4e4f0f1cc2a96c7b27ee368d1f045e95a210a742 (diff) | |
Polish traffic light example
Change-Id: I85f56f87b985ff966b975c571a399fa8f1f6e86f
Reviewed-by: Diana de Sousa <diana.desousa@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'examples/scxml/trafficlight-qml-dynamic')
| -rw-r--r-- | examples/scxml/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc | 6 | ||||
| -rw-r--r-- | examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/examples/scxml/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc b/examples/scxml/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc index 67ec5c8..c2846d9 100644 --- a/examples/scxml/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc +++ b/examples/scxml/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc @@ -55,14 +55,14 @@ \quotefromfile trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml \skipto import Scxml - \printuntil } + \printuntil /^\}/ \include trafficlight-state-machine.qdocinc We connect to the states as follows: \quotefromfile trafficlight-common/TrafficLight.qml - \skipto Light + \skipto /^ {8}Image/ \printuntil greenLight - \printuntil /^ {4}\}/ + \printuntil /^ {8}\}/ */ diff --git a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc index fa110f2..475a7be 100644 --- a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc +++ b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc @@ -1,9 +1,14 @@ <RCC> <qresource prefix="/"> <file alias="TrafficLight.qml">../trafficlight-common/TrafficLight.qml</file> - <file alias="Light.qml">../trafficlight-common/Light.qml</file> <file alias="Button.qml">../trafficlight-common/Button.qml</file> <file>trafficlight-qml-dynamic.qml</file> <file alias="statemachine.scxml">../trafficlight-common/statemachine.scxml</file> + <file alias="green.png">../trafficlight-common/green.png</file> + <file alias="yellow.png">../trafficlight-common/yellow.png</file> + <file alias="red.png">../trafficlight-common/red.png</file> + <file alias="pause.png">../trafficlight-common/pause.png</file> + <file alias="play.png">../trafficlight-common/play.png</file> + <file alias="background.png">../trafficlight-common/background.png</file> </qresource> </RCC> |