diff options
| author | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-05-29 15:33:26 (GMT) |
|---|---|---|
| committer | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-05-29 15:33:26 (GMT) |
| commit | d7069af3c46c8bcb01be0a3c48e7510738110fba (patch) | |
| tree | 68265dde258e73641eb070b8ada4e4b8f7388ead /src/corelib/animation | |
| parent | cc10cda46329866e229eb7f190b1e0aeff09f76d (diff) | |
| parent | 3cb304990f81799e6811b699b6b6ad1c32ec1107 (diff) | |
| download | Qt-d7069af3c46c8bcb01be0a3c48e7510738110fba.zip Qt-d7069af3c46c8bcb01be0a3c48e7510738110fba.tar.gz Qt-d7069af3c46c8bcb01be0a3c48e7510738110fba.tar.bz2 | |
Merge branch 'review/master'
Diffstat (limited to 'src/corelib/animation')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/animation/qpropertyanimation.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/animation/qpropertyanimation.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 16307e6..61d61df 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/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 47361a5..43b5283 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -102,7 +102,7 @@ QT_BEGIN_NAMESPACE typedef QPair<QObject *, QByteArray> QPropertyAnimationPair; typedef QHash<QPropertyAnimationPair, QPropertyAnimation*> QPropertyAnimationHash; -Q_GLOBAL_STATIC(QPropertyAnimationHash, _q_runningAnimations); +Q_GLOBAL_STATIC(QPropertyAnimationHash, _q_runningAnimations) Q_GLOBAL_STATIC_WITH_ARGS(QMutex, guardHashLock, (QMutex::Recursive) ) void QPropertyAnimationPrivate::updateMetaProperty() 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) }; |