diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-03-02 16:18:52 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-06 17:19:04 +0100 |
| commit | 1e6514a714c1f55b9cb57d2b8b65bc2305c2e2c6 (patch) | |
| tree | b617fae0a94bf074f8dc85123bd42dac00073e62 /src/corelib/animation/qpropertyanimation.cpp | |
| parent | 38d566f7131c3f7a1016ab5fe768e6e9a5c8e54e (diff) | |
Don't use QMutexPool from the animation framework
Use a plain QBasicMutex instead
Change-Id: I1abd35b4fe4e9f0401e73c7c3f503b00bba2baa9
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/animation/qpropertyanimation.cpp')
| -rw-r--r-- | src/corelib/animation/qpropertyanimation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index fc51a20a15..83ae7bafaa 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -92,7 +92,7 @@ #include "qanimationgroup.h" #include "qpropertyanimation_p.h" -#include <private/qmutexpool_p.h> +#include <QtCore/QMutex> #ifndef QT_NO_ANIMATION @@ -268,7 +268,8 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState, QPropertyAnimation *animToStop = 0; { #ifndef QT_NO_THREAD - QMutexLocker locker(QMutexPool::globalInstanceGet(&staticMetaObject)); + static QBasicMutex mutex; + QMutexLocker locker(&mutex); #endif typedef QPair<QObject *, QByteArray> QPropertyAnimationPair; typedef QHash<QPropertyAnimationPair, QPropertyAnimation*> QPropertyAnimationHash; |