diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-09-17 13:41:19 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-10-23 06:23:48 +0000 |
commit | 6eb86c06041e55576f619893c2a502c5bfab1aa4 (patch) | |
tree | 9a3844287698618711d95bc52009cbf8e52d1f4e /src/imports/statemachine | |
parent | 35c1f930295c85a1ce4b257fd05d596d378ccff8 (diff) |
Update plugins.qmltypes
Update all plugins.qmltypes except for QtQuick2.
Change-Id: If79b82fa54d159171f45a1bd2e9432c76b3c5686
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/imports/statemachine')
-rw-r--r-- | src/imports/statemachine/plugins.qmltypes | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/imports/statemachine/plugins.qmltypes b/src/imports/statemachine/plugins.qmltypes index db5897bb0f..c4b453b9e4 100644 --- a/src/imports/statemachine/plugins.qmltypes +++ b/src/imports/statemachine/plugins.qmltypes @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,7 @@ import QtQuick.tooling 1.1 // 'qmlplugindump -nonrelocatable QtQml.StateMachine 1.0' Module { + dependencies: [] Component { name: "FinalState" defaultProperty: "children" @@ -32,9 +33,17 @@ Module { Component { name: "QAbstractTransition" prototype: "QObject" + Enum { + name: "TransitionType" + values: { + "ExternalTransition": 0, + "InternalTransition": 1 + } + } Property { name: "sourceState"; type: "QState"; isReadonly: true; isPointer: true } Property { name: "targetState"; type: "QAbstractState"; isPointer: true } Property { name: "targetStates"; type: "QList<QAbstractState*>" } + Property { name: "transitionType"; revision: 1; type: "TransitionType" } Signal { name: "triggered" } } Component { name: "QFinalState"; prototype: "QAbstractState" } @@ -51,6 +60,7 @@ Module { } } Property { name: "defaultState"; type: "QAbstractState"; isPointer: true } + Property { name: "defaultTransition"; type: "QAbstractTransition"; isPointer: true } Property { name: "historyType"; type: "HistoryType" } } Component { |