diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-02-11 13:10:33 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2016-02-12 08:24:59 +0000 |
commit | 0bd8eb872110fe8e38ba44c2757f810d2b95c4df (patch) | |
tree | ebf4aa0e1e913d07f00e3e072bf1b1ffa601bf94 /examples | |
parent | 899d10b4d46c7ad2bacb048e1fc16920c5e7779d (diff) |
Move examples into module based subdir
The release process puts all examples based on their module name into
the same directory. Therefore each module has to group its examples
based on their module name.
Change-Id: I3695297ff0489fbbb2c4f4aa13e0c4baa7f011b7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/examples.pro | 21 | ||||
-rw-r--r-- | examples/scxml/calculator/calculator.pro (renamed from examples/calculator/calculator.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/calculator/calculator.scxml (renamed from examples/calculator/calculator.scxml) | 0 | ||||
-rw-r--r-- | examples/scxml/calculator/doc/images/calculator.png (renamed from examples/calculator/doc/images/calculator.png) | bin | 6054 -> 6054 bytes | |||
-rw-r--r-- | examples/scxml/calculator/doc/src/calculator.qdoc (renamed from examples/calculator/doc/src/calculator.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/calculator/main.cpp (renamed from examples/calculator/main.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/calculator/mainwindow.cpp (renamed from examples/calculator/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/calculator/mainwindow.h (renamed from examples/calculator/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/scxml/calculator/mainwindow.ui (renamed from examples/calculator/mainwindow.ui) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-common/Button.qml (renamed from examples/invoke-common/Button.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-common/MainView.qml (renamed from examples/invoke-common/MainView.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-common/SubView.qml (renamed from examples/invoke-common/SubView.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-common/statemachine.scxml (renamed from examples/invoke-common/statemachine.scxml) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-dynamic/doc/src/invoke-dynamic.qdoc (renamed from examples/invoke-dynamic/doc/src/invoke-dynamic.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-dynamic/invoke-dynamic.cpp (renamed from examples/invoke-dynamic/invoke-dynamic.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-dynamic/invoke-dynamic.pro (renamed from examples/invoke-dynamic/invoke-dynamic.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-dynamic/invoke-dynamic.qml (renamed from examples/invoke-dynamic/invoke-dynamic.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-dynamic/invoke-dynamic.qrc (renamed from examples/invoke-dynamic/invoke-dynamic.qrc) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-static/doc/src/invoke-static.qdoc (renamed from examples/invoke-static/doc/src/invoke-static.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-static/invoke-static.cpp (renamed from examples/invoke-static/invoke-static.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-static/invoke-static.pro (renamed from examples/invoke-static/invoke-static.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-static/invoke-static.qml (renamed from examples/invoke-static/invoke-static.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/invoke-static/invoke-static.qrc (renamed from examples/invoke-static/invoke-static.qrc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-common/Mediaplayer.qml (renamed from examples/mediaplayer-common/Mediaplayer.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-common/mainwindow.cpp (renamed from examples/mediaplayer-common/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-common/mainwindow.h (renamed from examples/mediaplayer-common/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-common/mainwindow.ui (renamed from examples/mediaplayer-common/mainwindow.ui) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-common/mediaplayer.scxml (renamed from examples/mediaplayer-common/mediaplayer.scxml) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-cppdatamodel/doc/src/mediaplayer-qml-cppdatamodel.qdoc (renamed from examples/mediaplayer-qml-cppdatamodel/doc/src/mediaplayer-qml-cppdatamodel.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-cppdatamodel.scxml (renamed from examples/mediaplayer-qml-cppdatamodel/mediaplayer-cppdatamodel.scxml) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp (renamed from examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro (renamed from examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qml (renamed from examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qrc (renamed from examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qrc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.cpp (renamed from examples/mediaplayer-qml-cppdatamodel/thedatamodel.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.h (renamed from examples/mediaplayer-qml-cppdatamodel/thedatamodel.h) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc (renamed from examples/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp (renamed from examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro (renamed from examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qml (renamed from examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qrc (renamed from examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qrc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-static/doc/src/mediaplayer-qml-static.qdoc (renamed from examples/mediaplayer-qml-static/doc/src/mediaplayer-qml-static.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.cpp (renamed from examples/mediaplayer-qml-static/mediaplayer-qml-static.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.pro (renamed from examples/mediaplayer-qml-static/mediaplayer-qml-static.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.qml (renamed from examples/mediaplayer-qml-static/mediaplayer-qml-static.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.qrc (renamed from examples/mediaplayer-qml-static/mediaplayer-qml-static.qrc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc (renamed from examples/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp (renamed from examples/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro (renamed from examples/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-dynamic/mediaplayer.qrc (renamed from examples/mediaplayer-widgets-dynamic/mediaplayer.qrc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc (renamed from examples/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp (renamed from examples/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro (renamed from examples/mediaplayer-widgets-static/mediaplayer-widgets-static.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/pinball/doc/images/pinball.png (renamed from examples/pinball/doc/images/pinball.png) | bin | 44973 -> 44973 bytes | |||
-rw-r--r-- | examples/scxml/pinball/doc/src/pinball.qdoc (renamed from examples/pinball/doc/src/pinball.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/pinball/main.cpp (renamed from examples/pinball/main.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/pinball/mainwindow.cpp (renamed from examples/pinball/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/pinball/mainwindow.h (renamed from examples/pinball/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/scxml/pinball/mainwindow.ui (renamed from examples/pinball/mainwindow.ui) | 0 | ||||
-rw-r--r-- | examples/scxml/pinball/pinball.pro (renamed from examples/pinball/pinball.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/pinball/pinball.scxml (renamed from examples/pinball/pinball.scxml) | 0 | ||||
-rw-r--r-- | examples/scxml/scxml.pro | 23 | ||||
-rw-r--r-- | examples/scxml/trafficlight-common/Button.qml (renamed from examples/trafficlight-common/Button.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-common/Light.qml (renamed from examples/trafficlight-common/Light.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-common/TrafficLight.qml (renamed from examples/trafficlight-common/TrafficLight.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-common/statemachine.scxml (renamed from examples/trafficlight-common/statemachine.scxml) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-common/trafficlight.cpp (renamed from examples/trafficlight-common/trafficlight.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-common/trafficlight.h (renamed from examples/trafficlight-common/trafficlight.h) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc (renamed from examples/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp (renamed from examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro (renamed from examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml (renamed from examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc (renamed from examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-static/doc/src/trafficlight-qml-static.qdoc (renamed from examples/trafficlight-qml-static/doc/src/trafficlight-qml-static.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-static/trafficlight-qml-static.cpp (renamed from examples/trafficlight-qml-static/trafficlight-qml-static.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-static/trafficlight-qml-static.pro (renamed from examples/trafficlight-qml-static/trafficlight-qml-static.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-static/trafficlight-qml-static.qml (renamed from examples/trafficlight-qml-static/trafficlight-qml-static.qml) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-qml-static/trafficlight-qml-static.qrc (renamed from examples/trafficlight-qml-static/trafficlight-qml-static.qrc) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-widgets-dynamic/doc/src/trafficlight-widgets-dynamic.qdoc (renamed from examples/trafficlight-widgets-dynamic/doc/src/trafficlight-widgets-dynamic.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp (renamed from examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro (renamed from examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.qrc (renamed from examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.qrc) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-widgets-static/doc/src/trafficlight-widgets-static.qdoc (renamed from examples/trafficlight-widgets-static/doc/src/trafficlight-widgets-static.qdoc) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.cpp (renamed from examples/trafficlight-widgets-static/trafficlight-widgets-static.cpp) | 0 | ||||
-rw-r--r-- | examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.pro (renamed from examples/trafficlight-widgets-static/trafficlight-widgets-static.pro) | 0 |
85 files changed, 24 insertions, 20 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 0ee3d2e..2d6d823 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,23 +1,4 @@ TEMPLATE = subdirs -!msvc{ -qtHaveModule(widgets) { - SUBDIRS += trafficlight-widgets-static - SUBDIRS += trafficlight-widgets-dynamic - SUBDIRS += mediaplayer-widgets-static - SUBDIRS += mediaplayer-widgets-dynamic - SUBDIRS += calculator - SUBDIRS += pinball -} +qtHaveModule(scxml): SUBDIRS += scxml -qtHaveModule(qml) { - SUBDIRS += trafficlight-qml-static - SUBDIRS += trafficlight-qml-dynamic - SUBDIRS += mediaplayer-qml-static - SUBDIRS += mediaplayer-qml-dynamic - - SUBDIRS += mediaplayer-qml-cppdatamodel - SUBDIRS += invoke-static - SUBDIRS += invoke-dynamic -} -} diff --git a/examples/calculator/calculator.pro b/examples/scxml/calculator/calculator.pro index 9c0ef68..9c0ef68 100644 --- a/examples/calculator/calculator.pro +++ b/examples/scxml/calculator/calculator.pro diff --git a/examples/calculator/calculator.scxml b/examples/scxml/calculator/calculator.scxml index 2b1e926..2b1e926 100644 --- a/examples/calculator/calculator.scxml +++ b/examples/scxml/calculator/calculator.scxml diff --git a/examples/calculator/doc/images/calculator.png b/examples/scxml/calculator/doc/images/calculator.png Binary files differindex 443242a..443242a 100644 --- a/examples/calculator/doc/images/calculator.png +++ b/examples/scxml/calculator/doc/images/calculator.png diff --git a/examples/calculator/doc/src/calculator.qdoc b/examples/scxml/calculator/doc/src/calculator.qdoc index 9edb0c3..9edb0c3 100644 --- a/examples/calculator/doc/src/calculator.qdoc +++ b/examples/scxml/calculator/doc/src/calculator.qdoc diff --git a/examples/calculator/main.cpp b/examples/scxml/calculator/main.cpp index 2587e2b..2587e2b 100644 --- a/examples/calculator/main.cpp +++ b/examples/scxml/calculator/main.cpp diff --git a/examples/calculator/mainwindow.cpp b/examples/scxml/calculator/mainwindow.cpp index eacafaa..eacafaa 100644 --- a/examples/calculator/mainwindow.cpp +++ b/examples/scxml/calculator/mainwindow.cpp diff --git a/examples/calculator/mainwindow.h b/examples/scxml/calculator/mainwindow.h index c8d77f3..c8d77f3 100644 --- a/examples/calculator/mainwindow.h +++ b/examples/scxml/calculator/mainwindow.h diff --git a/examples/calculator/mainwindow.ui b/examples/scxml/calculator/mainwindow.ui index 8001ff1..8001ff1 100644 --- a/examples/calculator/mainwindow.ui +++ b/examples/scxml/calculator/mainwindow.ui diff --git a/examples/invoke-common/Button.qml b/examples/scxml/invoke-common/Button.qml index 4e92e32..4e92e32 100644 --- a/examples/invoke-common/Button.qml +++ b/examples/scxml/invoke-common/Button.qml diff --git a/examples/invoke-common/MainView.qml b/examples/scxml/invoke-common/MainView.qml index 0f51ae5..0f51ae5 100644 --- a/examples/invoke-common/MainView.qml +++ b/examples/scxml/invoke-common/MainView.qml diff --git a/examples/invoke-common/SubView.qml b/examples/scxml/invoke-common/SubView.qml index cec32e3..cec32e3 100644 --- a/examples/invoke-common/SubView.qml +++ b/examples/scxml/invoke-common/SubView.qml diff --git a/examples/invoke-common/statemachine.scxml b/examples/scxml/invoke-common/statemachine.scxml index b9defeb..b9defeb 100644 --- a/examples/invoke-common/statemachine.scxml +++ b/examples/scxml/invoke-common/statemachine.scxml diff --git a/examples/invoke-dynamic/doc/src/invoke-dynamic.qdoc b/examples/scxml/invoke-dynamic/doc/src/invoke-dynamic.qdoc index aff0d9d..aff0d9d 100644 --- a/examples/invoke-dynamic/doc/src/invoke-dynamic.qdoc +++ b/examples/scxml/invoke-dynamic/doc/src/invoke-dynamic.qdoc diff --git a/examples/invoke-dynamic/invoke-dynamic.cpp b/examples/scxml/invoke-dynamic/invoke-dynamic.cpp index 958128d..958128d 100644 --- a/examples/invoke-dynamic/invoke-dynamic.cpp +++ b/examples/scxml/invoke-dynamic/invoke-dynamic.cpp diff --git a/examples/invoke-dynamic/invoke-dynamic.pro b/examples/scxml/invoke-dynamic/invoke-dynamic.pro index d86caeb..d86caeb 100644 --- a/examples/invoke-dynamic/invoke-dynamic.pro +++ b/examples/scxml/invoke-dynamic/invoke-dynamic.pro diff --git a/examples/invoke-dynamic/invoke-dynamic.qml b/examples/scxml/invoke-dynamic/invoke-dynamic.qml index d0cfa4d..d0cfa4d 100644 --- a/examples/invoke-dynamic/invoke-dynamic.qml +++ b/examples/scxml/invoke-dynamic/invoke-dynamic.qml diff --git a/examples/invoke-dynamic/invoke-dynamic.qrc b/examples/scxml/invoke-dynamic/invoke-dynamic.qrc index ecf8bd1..ecf8bd1 100644 --- a/examples/invoke-dynamic/invoke-dynamic.qrc +++ b/examples/scxml/invoke-dynamic/invoke-dynamic.qrc diff --git a/examples/invoke-static/doc/src/invoke-static.qdoc b/examples/scxml/invoke-static/doc/src/invoke-static.qdoc index a7987e3..a7987e3 100644 --- a/examples/invoke-static/doc/src/invoke-static.qdoc +++ b/examples/scxml/invoke-static/doc/src/invoke-static.qdoc diff --git a/examples/invoke-static/invoke-static.cpp b/examples/scxml/invoke-static/invoke-static.cpp index c6d0655..c6d0655 100644 --- a/examples/invoke-static/invoke-static.cpp +++ b/examples/scxml/invoke-static/invoke-static.cpp diff --git a/examples/invoke-static/invoke-static.pro b/examples/scxml/invoke-static/invoke-static.pro index 86e0845..86e0845 100644 --- a/examples/invoke-static/invoke-static.pro +++ b/examples/scxml/invoke-static/invoke-static.pro diff --git a/examples/invoke-static/invoke-static.qml b/examples/scxml/invoke-static/invoke-static.qml index 68f0556..68f0556 100644 --- a/examples/invoke-static/invoke-static.qml +++ b/examples/scxml/invoke-static/invoke-static.qml diff --git a/examples/invoke-static/invoke-static.qrc b/examples/scxml/invoke-static/invoke-static.qrc index cc5bcad..cc5bcad 100644 --- a/examples/invoke-static/invoke-static.qrc +++ b/examples/scxml/invoke-static/invoke-static.qrc diff --git a/examples/mediaplayer-common/Mediaplayer.qml b/examples/scxml/mediaplayer-common/Mediaplayer.qml index c3e1b98..c3e1b98 100644 --- a/examples/mediaplayer-common/Mediaplayer.qml +++ b/examples/scxml/mediaplayer-common/Mediaplayer.qml diff --git a/examples/mediaplayer-common/mainwindow.cpp b/examples/scxml/mediaplayer-common/mainwindow.cpp index e9a5767..e9a5767 100644 --- a/examples/mediaplayer-common/mainwindow.cpp +++ b/examples/scxml/mediaplayer-common/mainwindow.cpp diff --git a/examples/mediaplayer-common/mainwindow.h b/examples/scxml/mediaplayer-common/mainwindow.h index e9ed5fe..e9ed5fe 100644 --- a/examples/mediaplayer-common/mainwindow.h +++ b/examples/scxml/mediaplayer-common/mainwindow.h diff --git a/examples/mediaplayer-common/mainwindow.ui b/examples/scxml/mediaplayer-common/mainwindow.ui index 79679a8..79679a8 100644 --- a/examples/mediaplayer-common/mainwindow.ui +++ b/examples/scxml/mediaplayer-common/mainwindow.ui diff --git a/examples/mediaplayer-common/mediaplayer.scxml b/examples/scxml/mediaplayer-common/mediaplayer.scxml index 025245a..025245a 100644 --- a/examples/mediaplayer-common/mediaplayer.scxml +++ b/examples/scxml/mediaplayer-common/mediaplayer.scxml diff --git a/examples/mediaplayer-qml-cppdatamodel/doc/src/mediaplayer-qml-cppdatamodel.qdoc b/examples/scxml/mediaplayer-qml-cppdatamodel/doc/src/mediaplayer-qml-cppdatamodel.qdoc index d1b2eaa..d1b2eaa 100644 --- a/examples/mediaplayer-qml-cppdatamodel/doc/src/mediaplayer-qml-cppdatamodel.qdoc +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/doc/src/mediaplayer-qml-cppdatamodel.qdoc diff --git a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-cppdatamodel.scxml b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-cppdatamodel.scxml index 3683c19..3683c19 100644 --- a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-cppdatamodel.scxml +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-cppdatamodel.scxml diff --git a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp index cc087f2..cc087f2 100644 --- a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp diff --git a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro index fae454d..fae454d 100644 --- a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro diff --git a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qml b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qml index 252d69b..252d69b 100644 --- a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qml +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qml diff --git a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qrc b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qrc index 0de7eb7..0de7eb7 100644 --- a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qrc +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.qrc diff --git a/examples/mediaplayer-qml-cppdatamodel/thedatamodel.cpp b/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.cpp index 8ac6864..8ac6864 100644 --- a/examples/mediaplayer-qml-cppdatamodel/thedatamodel.cpp +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.cpp diff --git a/examples/mediaplayer-qml-cppdatamodel/thedatamodel.h b/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.h index ce4ac67..ce4ac67 100644 --- a/examples/mediaplayer-qml-cppdatamodel/thedatamodel.h +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.h diff --git a/examples/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc b/examples/scxml/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc index 7bdc6e3..7bdc6e3 100644 --- a/examples/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc +++ b/examples/scxml/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc diff --git a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp index 51f5738..51f5738 100644 --- a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp +++ b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp diff --git a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro index 1af874f..1af874f 100644 --- a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro +++ b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro diff --git a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qml b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qml index 3e936c3..3e936c3 100644 --- a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qml +++ b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qml diff --git a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qrc b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qrc index 0c7c40b..0c7c40b 100644 --- a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qrc +++ b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.qrc diff --git a/examples/mediaplayer-qml-static/doc/src/mediaplayer-qml-static.qdoc b/examples/scxml/mediaplayer-qml-static/doc/src/mediaplayer-qml-static.qdoc index 427a100..427a100 100644 --- a/examples/mediaplayer-qml-static/doc/src/mediaplayer-qml-static.qdoc +++ b/examples/scxml/mediaplayer-qml-static/doc/src/mediaplayer-qml-static.qdoc diff --git a/examples/mediaplayer-qml-static/mediaplayer-qml-static.cpp b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.cpp index c6d9d3a..c6d9d3a 100644 --- a/examples/mediaplayer-qml-static/mediaplayer-qml-static.cpp +++ b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.cpp diff --git a/examples/mediaplayer-qml-static/mediaplayer-qml-static.pro b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.pro index b6ca140..b6ca140 100644 --- a/examples/mediaplayer-qml-static/mediaplayer-qml-static.pro +++ b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.pro diff --git a/examples/mediaplayer-qml-static/mediaplayer-qml-static.qml b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.qml index 252d69b..252d69b 100644 --- a/examples/mediaplayer-qml-static/mediaplayer-qml-static.qml +++ b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.qml diff --git a/examples/mediaplayer-qml-static/mediaplayer-qml-static.qrc b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.qrc index e65d449..e65d449 100644 --- a/examples/mediaplayer-qml-static/mediaplayer-qml-static.qrc +++ b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.qrc diff --git a/examples/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc b/examples/scxml/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc index 6ef43ea..6ef43ea 100644 --- a/examples/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc +++ b/examples/scxml/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc diff --git a/examples/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp index f36a62e..f36a62e 100644 --- a/examples/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp +++ b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp diff --git a/examples/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro index e157f0c..e157f0c 100644 --- a/examples/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro +++ b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro diff --git a/examples/mediaplayer-widgets-dynamic/mediaplayer.qrc b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer.qrc index aecd468..aecd468 100644 --- a/examples/mediaplayer-widgets-dynamic/mediaplayer.qrc +++ b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer.qrc diff --git a/examples/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc b/examples/scxml/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc index f06db24..f06db24 100644 --- a/examples/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc +++ b/examples/scxml/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc diff --git a/examples/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp b/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp index dcc6d59..dcc6d59 100644 --- a/examples/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp +++ b/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp diff --git a/examples/mediaplayer-widgets-static/mediaplayer-widgets-static.pro b/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro index a108453..a108453 100644 --- a/examples/mediaplayer-widgets-static/mediaplayer-widgets-static.pro +++ b/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro diff --git a/examples/pinball/doc/images/pinball.png b/examples/scxml/pinball/doc/images/pinball.png Binary files differindex bbd390e..bbd390e 100644 --- a/examples/pinball/doc/images/pinball.png +++ b/examples/scxml/pinball/doc/images/pinball.png diff --git a/examples/pinball/doc/src/pinball.qdoc b/examples/scxml/pinball/doc/src/pinball.qdoc index f67b66d..f67b66d 100644 --- a/examples/pinball/doc/src/pinball.qdoc +++ b/examples/scxml/pinball/doc/src/pinball.qdoc diff --git a/examples/pinball/main.cpp b/examples/scxml/pinball/main.cpp index 4b4c06e..4b4c06e 100644 --- a/examples/pinball/main.cpp +++ b/examples/scxml/pinball/main.cpp diff --git a/examples/pinball/mainwindow.cpp b/examples/scxml/pinball/mainwindow.cpp index 424a786..424a786 100644 --- a/examples/pinball/mainwindow.cpp +++ b/examples/scxml/pinball/mainwindow.cpp diff --git a/examples/pinball/mainwindow.h b/examples/scxml/pinball/mainwindow.h index 985f77c..985f77c 100644 --- a/examples/pinball/mainwindow.h +++ b/examples/scxml/pinball/mainwindow.h diff --git a/examples/pinball/mainwindow.ui b/examples/scxml/pinball/mainwindow.ui index cc25176..cc25176 100644 --- a/examples/pinball/mainwindow.ui +++ b/examples/scxml/pinball/mainwindow.ui diff --git a/examples/pinball/pinball.pro b/examples/scxml/pinball/pinball.pro index 2cb002d..2cb002d 100644 --- a/examples/pinball/pinball.pro +++ b/examples/scxml/pinball/pinball.pro diff --git a/examples/pinball/pinball.scxml b/examples/scxml/pinball/pinball.scxml index 735bca2..735bca2 100644 --- a/examples/pinball/pinball.scxml +++ b/examples/scxml/pinball/pinball.scxml diff --git a/examples/scxml/scxml.pro b/examples/scxml/scxml.pro new file mode 100644 index 0000000..0ee3d2e --- /dev/null +++ b/examples/scxml/scxml.pro @@ -0,0 +1,23 @@ +TEMPLATE = subdirs + +!msvc{ +qtHaveModule(widgets) { + SUBDIRS += trafficlight-widgets-static + SUBDIRS += trafficlight-widgets-dynamic + SUBDIRS += mediaplayer-widgets-static + SUBDIRS += mediaplayer-widgets-dynamic + SUBDIRS += calculator + SUBDIRS += pinball +} + +qtHaveModule(qml) { + SUBDIRS += trafficlight-qml-static + SUBDIRS += trafficlight-qml-dynamic + SUBDIRS += mediaplayer-qml-static + SUBDIRS += mediaplayer-qml-dynamic + + SUBDIRS += mediaplayer-qml-cppdatamodel + SUBDIRS += invoke-static + SUBDIRS += invoke-dynamic +} +} diff --git a/examples/trafficlight-common/Button.qml b/examples/scxml/trafficlight-common/Button.qml index 36bec5f..36bec5f 100644 --- a/examples/trafficlight-common/Button.qml +++ b/examples/scxml/trafficlight-common/Button.qml diff --git a/examples/trafficlight-common/Light.qml b/examples/scxml/trafficlight-common/Light.qml index f444a9c..f444a9c 100644 --- a/examples/trafficlight-common/Light.qml +++ b/examples/scxml/trafficlight-common/Light.qml diff --git a/examples/trafficlight-common/TrafficLight.qml b/examples/scxml/trafficlight-common/TrafficLight.qml index 4d8cb15..4d8cb15 100644 --- a/examples/trafficlight-common/TrafficLight.qml +++ b/examples/scxml/trafficlight-common/TrafficLight.qml diff --git a/examples/trafficlight-common/statemachine.scxml b/examples/scxml/trafficlight-common/statemachine.scxml index 4224e81..4224e81 100644 --- a/examples/trafficlight-common/statemachine.scxml +++ b/examples/scxml/trafficlight-common/statemachine.scxml diff --git a/examples/trafficlight-common/trafficlight.cpp b/examples/scxml/trafficlight-common/trafficlight.cpp index 7341c96..7341c96 100644 --- a/examples/trafficlight-common/trafficlight.cpp +++ b/examples/scxml/trafficlight-common/trafficlight.cpp diff --git a/examples/trafficlight-common/trafficlight.h b/examples/scxml/trafficlight-common/trafficlight.h index 0623249..0623249 100644 --- a/examples/trafficlight-common/trafficlight.h +++ b/examples/scxml/trafficlight-common/trafficlight.h diff --git a/examples/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc b/examples/scxml/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc index c2c4dc7..c2c4dc7 100644 --- a/examples/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc +++ b/examples/scxml/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc diff --git a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp index d12db7b..d12db7b 100644 --- a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp +++ b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp diff --git a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro index 886424e..886424e 100644 --- a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro +++ b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro diff --git a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml index 3b406c7..3b406c7 100644 --- a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml +++ b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml diff --git a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc index fa110f2..fa110f2 100644 --- a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc +++ b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc diff --git a/examples/trafficlight-qml-static/doc/src/trafficlight-qml-static.qdoc b/examples/scxml/trafficlight-qml-static/doc/src/trafficlight-qml-static.qdoc index 6932dbc..6932dbc 100644 --- a/examples/trafficlight-qml-static/doc/src/trafficlight-qml-static.qdoc +++ b/examples/scxml/trafficlight-qml-static/doc/src/trafficlight-qml-static.qdoc diff --git a/examples/trafficlight-qml-static/trafficlight-qml-static.cpp b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.cpp index 2e671f3..2e671f3 100644 --- a/examples/trafficlight-qml-static/trafficlight-qml-static.cpp +++ b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.cpp diff --git a/examples/trafficlight-qml-static/trafficlight-qml-static.pro b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.pro index 4c19594..4c19594 100644 --- a/examples/trafficlight-qml-static/trafficlight-qml-static.pro +++ b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.pro diff --git a/examples/trafficlight-qml-static/trafficlight-qml-static.qml b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.qml index 28024a0..28024a0 100644 --- a/examples/trafficlight-qml-static/trafficlight-qml-static.qml +++ b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.qml diff --git a/examples/trafficlight-qml-static/trafficlight-qml-static.qrc b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.qrc index d75853c..d75853c 100644 --- a/examples/trafficlight-qml-static/trafficlight-qml-static.qrc +++ b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.qrc diff --git a/examples/trafficlight-widgets-dynamic/doc/src/trafficlight-widgets-dynamic.qdoc b/examples/scxml/trafficlight-widgets-dynamic/doc/src/trafficlight-widgets-dynamic.qdoc index 236f410..236f410 100644 --- a/examples/trafficlight-widgets-dynamic/doc/src/trafficlight-widgets-dynamic.qdoc +++ b/examples/scxml/trafficlight-widgets-dynamic/doc/src/trafficlight-widgets-dynamic.qdoc diff --git a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp b/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp index 223da17..223da17 100644 --- a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp +++ b/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp diff --git a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro b/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro index ffcc2ff..ffcc2ff 100644 --- a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro +++ b/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro diff --git a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.qrc b/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.qrc index 897d792..897d792 100644 --- a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.qrc +++ b/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.qrc diff --git a/examples/trafficlight-widgets-static/doc/src/trafficlight-widgets-static.qdoc b/examples/scxml/trafficlight-widgets-static/doc/src/trafficlight-widgets-static.qdoc index 03e0680..03e0680 100644 --- a/examples/trafficlight-widgets-static/doc/src/trafficlight-widgets-static.qdoc +++ b/examples/scxml/trafficlight-widgets-static/doc/src/trafficlight-widgets-static.qdoc diff --git a/examples/trafficlight-widgets-static/trafficlight-widgets-static.cpp b/examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.cpp index e0d59e3..e0d59e3 100644 --- a/examples/trafficlight-widgets-static/trafficlight-widgets-static.cpp +++ b/examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.cpp diff --git a/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro b/examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.pro index b40a692..b40a692 100644 --- a/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro +++ b/examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.pro |