summaryrefslogtreecommitdiffstats
path: root/examples/scxml
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-02-25 09:18:04 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-02-25 08:27:03 +0000
commitf8f1ddfd1258d224afea6c9774e60f76e294032e (patch)
treed51c7b877169221983ee2d8ad6f84063c94ba617 /examples/scxml
parentf4aee241f46aefe6bc775a1d0fc061ff6d088c57 (diff)
Examples: Return on QML load error.
Prevents hanging processes should an error while loading QML occur. Change-Id: I35f68ef170755f075fe95e2e535e363a49c598ee Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'examples/scxml')
-rw-r--r--examples/scxml/invoke-dynamic/invoke-dynamic.cpp2
-rw-r--r--examples/scxml/invoke-static/invoke-static.cpp3
-rw-r--r--examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp2
-rw-r--r--examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.cpp2
-rw-r--r--examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp2
-rw-r--r--examples/scxml/trafficlight-qml-static/trafficlight-qml-static.cpp3
6 files changed, 14 insertions, 0 deletions
diff --git a/examples/scxml/invoke-dynamic/invoke-dynamic.cpp b/examples/scxml/invoke-dynamic/invoke-dynamic.cpp
index 958128d..4d48e16 100644
--- a/examples/scxml/invoke-dynamic/invoke-dynamic.cpp
+++ b/examples/scxml/invoke-dynamic/invoke-dynamic.cpp
@@ -58,6 +58,8 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:/invoke-dynamic.qml")));
+ if (engine.rootObjects().isEmpty())
+ return -1;
return app.exec();
}
diff --git a/examples/scxml/invoke-static/invoke-static.cpp b/examples/scxml/invoke-static/invoke-static.cpp
index c6d0655..c955ebe 100644
--- a/examples/scxml/invoke-static/invoke-static.cpp
+++ b/examples/scxml/invoke-static/invoke-static.cpp
@@ -63,6 +63,9 @@ int main(int argc, char *argv[])
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/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp
index 51f5738..dce11c7 100644
--- a/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp
+++ b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.cpp
@@ -58,6 +58,8 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:///mediaplayer-qml-dynamic.qml")));
+ if (engine.rootObjects().isEmpty())
+ return -1;
return app.exec();
}
diff --git a/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.cpp b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.cpp
index c6d9d3a..9aa1ea3 100644
--- a/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.cpp
+++ b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.cpp
@@ -65,6 +65,8 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
engine.rootContext()->setContextProperty(QStringLiteral("mediaPlayerStateMachine"), &stateMachine);
engine.load(QUrl(QStringLiteral("qrc:///mediaplayer-qml-static.qml")));
+ if (engine.rootObjects().isEmpty())
+ return -1;
return app.exec();
}
diff --git a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp
index d12db7b..b862386 100644
--- a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp
+++ b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.cpp
@@ -58,6 +58,8 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:///trafficlight-qml-dynamic.qml")));
+ if (engine.rootObjects().isEmpty())
+ return -1;
return app.exec();
}
diff --git a/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.cpp b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.cpp
index 2e671f3..f675a68 100644
--- a/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.cpp
+++ b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.cpp
@@ -63,6 +63,9 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
engine.rootContext()->setContextProperty(QStringLiteral("trafficLightStateMachine"), &stateMachine);
engine.load(QUrl(QStringLiteral("qrc:/trafficlight-qml-static.qml")));
+ if (engine.rootObjects().isEmpty())
+ return -1;
+
stateMachine.start();
return app.exec();