diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2014-10-09 16:05:33 +0200 |
|---|---|---|
| committer | Brett Stottlemyer <bstottle@ford.com> | 2014-10-21 02:13:33 +0200 |
| commit | f830c109d09d835551c1325c4904fc9a490b3754 (patch) | |
| tree | 6bb3c09cb44ed0a5446749701ac4281831a62967 /src/imports/statemachine/plugins.qmltypes | |
| parent | 5871f3e829f1f48995b5d6c03f7ad31fcda386e5 (diff) | |
qmlstatemachine: Rename StateBase to State
As discussed with Brett Stottlmyer and Alan Alpert.
Add a section about the implications when importing both
QtQml.StateMachine
and QtQuick in one single QML file.
Change-Id: I8755f4b578e2a6ff4c2377c7a8a0b996ba9b7129
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports/statemachine/plugins.qmltypes')
| -rw-r--r-- | src/imports/statemachine/plugins.qmltypes | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/statemachine/plugins.qmltypes b/src/imports/statemachine/plugins.qmltypes index a53d68f8e8..db5897bb0f 100644 --- a/src/imports/statemachine/plugins.qmltypes +++ b/src/imports/statemachine/plugins.qmltypes @@ -130,16 +130,16 @@ Module { exports: ["QtQml.StateMachine/SignalTransition 1.0"] exportMetaObjectRevisions: [0] Property { name: "signal"; type: "QJSValue" } - Property { name: "guard"; type: "bool" } + Property { name: "guard"; type: "QQmlScriptString" } Signal { name: "invokeYourself" } Signal { name: "qmlSignalChanged" } Method { name: "invoke" } } Component { - name: "StateBase" + name: "State" defaultProperty: "children" prototype: "QState" - exports: ["QtQml.StateMachine/StateBase 1.0"] + exports: ["QtQml.StateMachine/State 1.0"] exportMetaObjectRevisions: [0] Property { name: "children"; type: "QObject"; isList: true; isReadonly: true } } |