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/statemachine.pro | |
| 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/statemachine.pro')
| -rw-r--r-- | src/imports/statemachine/statemachine.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/statemachine/statemachine.pro b/src/imports/statemachine/statemachine.pro index 4cc7089a32..9bb88074e9 100644 --- a/src/imports/statemachine/statemachine.pro +++ b/src/imports/statemachine/statemachine.pro @@ -8,7 +8,7 @@ QT = core-private qml-private SOURCES = \ $$PWD/finalstate.cpp \ $$PWD/signaltransition.cpp \ - $$PWD/statebase.cpp \ + $$PWD/state.cpp \ $$PWD/statemachine.cpp \ $$PWD/timeouttransition.cpp \ $$PWD/plugin.cpp @@ -17,7 +17,7 @@ HEADERS = \ $$PWD/childrenprivate.h \ $$PWD/finalstate.h \ $$PWD/signaltransition.h \ - $$PWD/statebase.h \ + $$PWD/state.h \ $$PWD/statemachine.h \ $$PWD/timeouttransition.h |