diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-03-07 12:24:30 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-07 12:48:49 +0100 |
| commit | 5713dde8a1e6a35483134ffe9d986db66b208cf5 (patch) | |
| tree | 75d03f3495f47a65dac52f7d673dbb7867cce9da /src/corelib | |
| parent | 83cabda862dced9477d155c84df9440047c856cf (diff) | |
Fix deadlock in QPropertyAnimation
Commit 1e6514a714c1f55b9cb57d2b8b65bc2305c2e2c6 changed the mutex from
recursive to non-recursive, which could introduce dead lock if the
animation starts other animation (This is the case in QMainWindow
layouts)
Change-Id: I1b149b78a802748eb24b5700fffeca0b8555f005
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/animation/qpropertyanimation.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 83ae7bafaa..f7ba49c3cd 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -281,6 +281,7 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState, d->updateMetaProperty(); animToStop = hash.value(key, 0); hash.insert(key, this); + locker.unlock(); // update the default start value if (oldState == Stopped) { d->setDefaultStartEndValue(d->targetValue->property(d->propertyName.constData())); |