diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-26 16:28:56 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-27 09:59:11 +0000 |
| commit | 9c9b556025d370bf70a60f46b1674a6c950fd491 (patch) | |
| tree | c5d180a99dd086f1221c9cb5900ed1ac9108b601 /examples/scxml | |
| parent | 432bb2234a01911784296ad743ca14b156b356c0 (diff) | |
Update plugins.qmltypes
Also, have the extended state machine type follow the usual naming
scheme, and increment the minor version everywhere. Since we don't
need to be compatible with 5.7 we don't need to drag the 5.7 version
around at all. In addition, we also don't need to namespace QtScxml
in any QML context and, using the additional type information, we can
easily constrain the types of all state machiens in QML.
The fromFile() and fromData() methods don't have to be Q_INVOKABLE and
that just confuses qmlplugindump, do drop Q_INVOKABLE there.
Change-Id: I7bd3f10ac458d64fcb98caece770b5d4c61abdb5
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'examples/scxml')
5 files changed, 9 insertions, 9 deletions
diff --git a/examples/scxml/calculator-qml/calculator-qml.qml b/examples/scxml/calculator-qml/calculator-qml.qml index fb32a69..386549e 100644 --- a/examples/scxml/calculator-qml/calculator-qml.qml +++ b/examples/scxml/calculator-qml/calculator-qml.qml @@ -51,7 +51,7 @@ import CalculatorStateMachine 1.0 import QtQuick 2.5 import QtQuick.Window 2.0 -import QtScxml 5.7 +import QtScxml 5.8 Window { id: window diff --git a/examples/scxml/invoke-common/MainView.qml b/examples/scxml/invoke-common/MainView.qml index b279701..8d8c3e3 100644 --- a/examples/scxml/invoke-common/MainView.qml +++ b/examples/scxml/invoke-common/MainView.qml @@ -50,12 +50,12 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtScxml 5.7 +import QtScxml 5.8 Window { id: window visible: true - property var stateMachine + property StateMachine stateMachine color: "black" width: 400 diff --git a/examples/scxml/invoke-dynamic/invoke-dynamic.qml b/examples/scxml/invoke-dynamic/invoke-dynamic.qml index 0e38d67..4ff85b4 100644 --- a/examples/scxml/invoke-dynamic/invoke-dynamic.qml +++ b/examples/scxml/invoke-dynamic/invoke-dynamic.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtScxml 5.7 as Scxml +import QtScxml 5.8 MainView { stateMachine: directions.stateMachine - Scxml.StateMachineLoader { + StateMachineLoader { id: directions source: "qrc:///statemachine.scxml" } diff --git a/examples/scxml/mediaplayer-common/Mediaplayer.qml b/examples/scxml/mediaplayer-common/Mediaplayer.qml index c5e0bcf..fdeb9d2 100644 --- a/examples/scxml/mediaplayer-common/Mediaplayer.qml +++ b/examples/scxml/mediaplayer-common/Mediaplayer.qml @@ -50,11 +50,11 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtScxml 5.7 +import QtScxml 5.8 Window { id: root - property QtObject stateMachine: scxmlLoader.stateMachine + property StateMachine stateMachine: scxmlLoader.stateMachine property alias source: scxmlLoader.source visible: true diff --git a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml index c04c877..aef249a 100644 --- a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml +++ b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtScxml 5.7 as Scxml +import QtScxml 5.8 TrafficLight { - Scxml.StateMachineLoader { + StateMachineLoader { id: loader source: "qrc:///statemachine.scxml" } |