summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlanimation_p_p.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-02-17 02:13:29 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-02-18 05:17:15 (GMT)
commit9fb06ea43e807f2bbb40de89e9af5f2cca02212f (patch)
treed1cdc70f837be31188ab5c23fb7675a5216f3053 /src/declarative/util/qmlanimation_p_p.h
parent2ea6cf7976fc9a2d8a67b32ba4854c9eeb583c81 (diff)
downloadQt-9fb06ea43e807f2bbb40de89e9af5f2cca02212f.zip
Qt-9fb06ea43e807f2bbb40de89e9af5f2cca02212f.tar.gz
Qt-9fb06ea43e807f2bbb40de89e9af5f2cca02212f.tar.bz2
Transitions and Behaviors should exclusively control their animations.
Don't allow manual control (starting, stopping, etc) of animations in a Behavior or Transition.
Diffstat (limited to 'src/declarative/util/qmlanimation_p_p.h')
-rw-r--r--src/declarative/util/qmlanimation_p_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h
index 91f9f88..288aaa8 100644
--- a/src/declarative/util/qmlanimation_p_p.h
+++ b/src/declarative/util/qmlanimation_p_p.h
@@ -210,17 +210,17 @@ public:
QmlAbstractAnimationPrivate()
: running(false), paused(false), alwaysRunToEnd(false), repeat(false),
connectedTimeLine(false), componentComplete(true), startOnCompletion(false),
- avoidPropertyValueSourceStart(false), group(0) {}
+ avoidPropertyValueSourceStart(false), disableUserControl(false), group(0) {}
bool running:1;
bool paused:1;
bool alwaysRunToEnd:1;
bool repeat:1;
bool connectedTimeLine:1;
-
bool componentComplete:1;
bool startOnCompletion:1;
bool avoidPropertyValueSourceStart:1;
+ bool disableUserControl:1;
void commence();