9 files changed, 48 insertions, 44 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index b0ce10c..962e2fb 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -159,7 +159,7 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QThreadStorage<QUnifiedTimer *>, unifiedTimer);
+Q_GLOBAL_STATIC(QThreadStorage<QUnifiedTimer *>, unifiedTimer)
 
 QUnifiedTimer::QUnifiedTimer() : QObject(), lastTick(0), timingInterval(DEFAULT_TIMER_INTERVAL), consistentTiming(false)
 {
diff --git a/src/corelib/animation/qanimationgroup_p.h b/src/corelib/animation/qanimationgroup_p.h
index a7bd0fa..0f07138 100644
--- a/src/corelib/animation/qanimationgroup_p.h
+++ b/src/corelib/animation/qanimationgroup_p.h
@@ -57,7 +57,7 @@
 
 #include <QtCore/qlist.h>
 
-#include "qabstractanimation_p.h"
+#include "private/qabstractanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/animation/qparallelanimationgroup_p.h b/src/corelib/animation/qparallelanimationgroup_p.h
index f36d972..ecd6791 100644
--- a/src/corelib/animation/qparallelanimationgroup_p.h
+++ b/src/corelib/animation/qparallelanimationgroup_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qparallelanimationgroup.h"
-#include "qanimationgroup_p.h"
+#include "private/qanimationgroup_p.h"
 #include <QtCore/QHash>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index 47361a5..357a6ac 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -91,19 +91,17 @@
 
 #include "qpropertyanimation.h"
 #include "qanimationgroup.h"
-#include <QtCore/qdebug.h>
-
 #include "qpropertyanimation_p.h"
 
 #include <QtCore/qmath.h>
 #include <QtCore/qmutex.h>
+#include <private/qmutexpool_p.h>
 
 QT_BEGIN_NAMESPACE
 
 typedef QPair<QObject *, QByteArray> QPropertyAnimationPair;
 typedef QHash<QPropertyAnimationPair, QPropertyAnimation*> QPropertyAnimationHash;
-Q_GLOBAL_STATIC(QPropertyAnimationHash, _q_runningAnimations);
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, guardHashLock, (QMutex::Recursive) )
+Q_GLOBAL_STATIC(QPropertyAnimationHash, _q_runningAnimations)
 
 void QPropertyAnimationPrivate::updateMetaProperty()
 {
@@ -284,27 +282,32 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State oldState,
     }
 
     QVariantAnimation::updateState(oldState, newState);
-    QMutexLocker locker(guardHashLock());
-    QPropertyAnimationHash * hash = _q_runningAnimations();
-    QPropertyAnimationPair key(d->target, d->propertyName);
-    if (newState == Running) {
-        d->updateMetaProperty();
-        QPropertyAnimation *oldAnim = hash->value(key, 0);
-        if (oldAnim) {
-            // try to stop the top level group
-            QAbstractAnimation *current = oldAnim;
-            while (current->group() && current->state() != Stopped)
-                current = current->group();
-            current->stop();
-        }
-        hash->insert(key, this);
 
-        // update the default start value
-        if (oldState == Stopped) {
-            d->setDefaultStartValue(d->target->property(d->propertyName.constData()));
+    QPropertyAnimation *animToStop = 0;
+    {
+        QPropertyAnimationHash * hash = _q_runningAnimations();
+        QMutexLocker locker(QMutexPool::globalInstanceGet(hash));
+        QPropertyAnimationPair key(d->target, d->propertyName);
+        if (newState == Running) {
+            d->updateMetaProperty();
+            animToStop = hash->value(key, 0);
+            hash->insert(key, this);
+            // update the default start value
+            if (oldState == Stopped) {
+                d->setDefaultStartValue(d->target->property(d->propertyName.constData()));
+            }
+        } else if (hash->value(key) == this) {
+            hash->remove(key);
         }
-    } else if (hash->value(key) == this) {
-        hash->remove(key);
+    }
+
+    //we need to do that after the mutex was unlocked
+    if (animToStop) {
+        // try to stop the top level group
+        QAbstractAnimation *current = animToStop;
+        while (current->group() && current->state() != Stopped)
+            current = current->group();
+        current->stop();
     }
 }
 
diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h
index 39317ba..2fdd50c 100644
--- a/src/corelib/animation/qpropertyanimation.h
+++ b/src/corelib/animation/qpropertyanimation.h
@@ -76,7 +76,7 @@ protected:
     void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState);
 
 private:
-    Q_PRIVATE_SLOT(d_func(), void _q_targetDestroyed());
+    Q_PRIVATE_SLOT(d_func(), void _q_targetDestroyed())
     Q_DISABLE_COPY(QPropertyAnimation)
     Q_DECLARE_PRIVATE(QPropertyAnimation)
 };
diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h
index a4387dd..16c63ab 100644
--- a/src/corelib/animation/qpropertyanimation_p.h
+++ b/src/corelib/animation/qpropertyanimation_p.h
@@ -56,7 +56,7 @@
 #include "qpropertyanimation.h"
 #include <QtCore/qmetaobject.h>
 
-#include "qvariantanimation_p.h"
+#include "private/qvariantanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/animation/qsequentialanimationgroup_p.h b/src/corelib/animation/qsequentialanimationgroup_p.h
index 3ac90f8..c01aaf0 100644
--- a/src/corelib/animation/qsequentialanimationgroup_p.h
+++ b/src/corelib/animation/qsequentialanimationgroup_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qsequentialanimationgroup.h"
-#include "qanimationgroup_p.h"
+#include "private/qanimationgroup_p.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 827993c..9303034 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -44,11 +44,10 @@
 #include "qvariantanimation.h"
 #include "qvariantanimation_p.h"
 
-#include <QtCore/QRect>
-#include <QtCore/QLineF>
-#include <QtCore/QLine>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/qdebug.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qline.h>
+#include <QtCore/qmutex.h>
+#include <private/qmutexpool_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -365,8 +364,8 @@ void QVariantAnimation::setEasingCurve(const QEasingCurve &easing)
     d->recalculateCurrentInterval();
 }
 
-Q_GLOBAL_STATIC(QVector<QVariantAnimation::Interpolator>, registeredInterpolators)
-Q_GLOBAL_STATIC(QReadWriteLock, registeredInterpolatorsLock)
+typedef QVector<QVariantAnimation::Interpolator> QInterpolatorVector;
+Q_GLOBAL_STATIC(QInterpolatorVector, registeredInterpolators)
 
 /*!
     \fn void qRegisterAnimationInterpolator(QVariant (*func)(const T &from, const T &to, qreal progress))
@@ -398,10 +397,11 @@ Q_GLOBAL_STATIC(QReadWriteLock, registeredInterpolatorsLock)
 void QVariantAnimation::registerInterpolator(QVariantAnimation::Interpolator func, int interpolationType)
 {
     // will override any existing interpolators
-    QWriteLocker locker(registeredInterpolatorsLock());
-    if (int(interpolationType) >= registeredInterpolators()->count())
-        registeredInterpolators()->resize(int(interpolationType) + 1);
-    registeredInterpolators()->replace(interpolationType, func);
+    QInterpolatorVector *interpolators = registeredInterpolators();
+    QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators));
+    if (int(interpolationType) >= interpolators->count())
+        interpolators->resize(int(interpolationType) + 1);
+    interpolators->replace(interpolationType, func);
 }
 
 
@@ -412,10 +412,11 @@ template<typename T> static inline QVariantAnimation::Interpolator castToInterpo
 
 QVariantAnimation::Interpolator QVariantAnimationPrivate::getInterpolator(int interpolationType)
 {
-    QReadLocker locker(registeredInterpolatorsLock());
+    QInterpolatorVector *interpolators = registeredInterpolators();
+    QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators));
     QVariantAnimation::Interpolator ret = 0;
-    if (interpolationType < registeredInterpolators()->count()) {
-        ret = registeredInterpolators()->at(interpolationType);
+    if (interpolationType < interpolators->count()) {
+        ret = interpolators->at(interpolationType);
         if (ret) return ret;
     }
 
diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h
index aee2324..3ae0e39 100644
--- a/src/corelib/animation/qvariantanimation_p.h
+++ b/src/corelib/animation/qvariantanimation_p.h
@@ -58,7 +58,7 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qvector.h>
 
-#include "qabstractanimation_p.h"
+#include "private/qabstractanimation_p.h"
 
 QT_BEGIN_NAMESPACE