Changeset 846 for trunk/src/corelib/animation/qvariantanimation.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/animation/qvariantanimation.cpp (modified) (3 diffs)

trunk/src/corelib/animation/qvariantanimation.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -436 +436 @@
     if (!interpolators)
         return;
+
     QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators));
+
     if (int(interpolationType) >= interpolators->count())
         interpolators->resize(int(interpolationType) + 1);
@@ -451 +453 @@
 {
     QInterpolatorVector *interpolators = registeredInterpolators();
+
     QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators));
+
     QVariantAnimation::Interpolator ret = 0;
     if (interpolationType < interpolators->count()) {