diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-26 09:43:33 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-26 09:51:56 +0200 |
| commit | e9e6f70d355499d551a26960d236644f92ea38af (patch) | |
| tree | 542840d4b3b8ff82d6fab38c9ad2615d3592b793 /src/quick/util/qquickstatechangescript.cpp | |
| parent | 916ced089f37d96ca8ef1cdb938791247bd44b72 (diff) | |
| parent | eadc35f499edd25d5d1c5f803db1d61675c1cc2c (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/qml/qml/qqmlobjectcreator_p.h
Change-Id: I60858ddb46866a8fa1a8576bb05b412afeeb4e41
Diffstat (limited to 'src/quick/util/qquickstatechangescript.cpp')
| -rw-r--r-- | src/quick/util/qquickstatechangescript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp index 89fa22205f..02a9507ce9 100644 --- a/src/quick/util/qquickstatechangescript.cpp +++ b/src/quick/util/qquickstatechangescript.cpp @@ -67,7 +67,7 @@ public: A StateChangeScript is run upon entering a state. You can optionally use ScriptAction to specify the point in the transition at which - the StateChangeScript should to be run. + the StateChangeScript should be run. \snippet qml/states/statechangescript.qml state and transition |