diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:41:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:41:43 +0100 |
| commit | cc0eb9c2aa9032c6a7bf2ab05d1eb913a09fa4f1 (patch) | |
| tree | 7314014389e227bd7c9b28d97eebcd072e4852a2 /src/particles/qquickgroupgoal.cpp | |
| parent | cb2ac154273a8c07a1e4a14246ae22f6e0deaeda (diff) | |
| parent | 0a74dc69b4c57a15da90be29b598371dfa63f7ee (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/jsruntime/qv4managed_p.h
Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
Diffstat (limited to 'src/particles/qquickgroupgoal.cpp')
| -rw-r--r-- | src/particles/qquickgroupgoal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/particles/qquickgroupgoal.cpp b/src/particles/qquickgroupgoal.cpp index 5ef09c4185..8a487ae4c5 100644 --- a/src/particles/qquickgroupgoal.cpp +++ b/src/particles/qquickgroupgoal.cpp @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE \qmlproperty bool QtQuick.Particles::GroupGoal::jump If true, affected particles will jump directly to the target group instead of taking the - the shortest valid path to get there. They will also not finish their current state, + shortest valid path to get there. They will also not finish their current state, but immediately move to the beginning of the goal state. Default is false. |