summaryrefslogtreecommitdiffstats
path: root/examples/scxml/invoke-static
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2016-03-09 16:38:29 +0100
committerUlf Hermann <ulf.hermann@theqtcompany.com>2016-03-30 11:56:40 +0000
commita14b1e4c4787fa1e4a7d470444c248fd08817105 (patch)
tree53cd8d65c7aa8a983e1381a072a511c81ee028c5 /examples/scxml/invoke-static
parent703c6a6bee98c5d316de408867982b1684ad550b (diff)
Change examples to follow best practices
Adding QObjects as context properties to QML engines is not the best way to interoperate between QML and C++. This change exposes all state machines as proper QML components and instantiates them from QML. Also, it drops all the now unnecessary init() calls. Change-Id: Id44b4038542dd9469e02831c1bb54f096af1b6ff Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'examples/scxml/invoke-static')
-rw-r--r--examples/scxml/invoke-static/invoke-static.cpp5
-rw-r--r--examples/scxml/invoke-static/invoke-static.qml6
2 files changed, 6 insertions, 5 deletions
diff --git a/examples/scxml/invoke-static/invoke-static.cpp b/examples/scxml/invoke-static/invoke-static.cpp
index c955ebe..d53eb48 100644
--- a/examples/scxml/invoke-static/invoke-static.cpp
+++ b/examples/scxml/invoke-static/invoke-static.cpp
@@ -58,15 +58,12 @@ int main(int argc, char *argv[])
{
QGuiApplication app(argc, argv);
- Directions stateMachine;
+ qmlRegisterType<Directions>("Directions", 1, 0, "Directions");
QQmlApplicationEngine engine;
- engine.rootContext()->setContextProperty(QStringLiteral("directions"), &stateMachine);
engine.load(QUrl(QStringLiteral("qrc:/invoke-static.qml")));
if (engine.rootObjects().isEmpty())
return -1;
- stateMachine.start();
-
return app.exec();
}
diff --git a/examples/scxml/invoke-static/invoke-static.qml b/examples/scxml/invoke-static/invoke-static.qml
index 68f0556..dc59e1b 100644
--- a/examples/scxml/invoke-static/invoke-static.qml
+++ b/examples/scxml/invoke-static/invoke-static.qml
@@ -48,6 +48,10 @@
**
****************************************************************************/
+import Directions 1.0
+
MainView {
- stateMachine: directions
+ stateMachine: Directions {
+ running: true
+ }
}