diff options
| author | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2010-01-21 12:34:52 (GMT) |
|---|---|---|
| committer | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2010-01-21 12:36:42 (GMT) |
| commit | 6b92cb8ec199159d629c013fbd4b4b7ab8ad60db (patch) | |
| tree | c22cba83d08cc61791a7a1914665694264f4e65e /src/corelib/animation/qabstractanimation.cpp | |
| parent | 01a54a8d903abddd8b1fbddb1410e56878f41b7c (diff) | |
| download | Qt-6b92cb8ec199159d629c013fbd4b4b7ab8ad60db.zip Qt-6b92cb8ec199159d629c013fbd4b4b7ab8ad60db.tar.gz Qt-6b92cb8ec199159d629c013fbd4b4b7ab8ad60db.tar.bz2 | |
Make the animation api compile when QT_NO_THREAD is defined
Task-number: QTBUG-6890
Reviewed-by: Thierry
Diffstat (limited to 'src/corelib/animation/qabstractanimation.cpp')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index b7afd9f..f5a9d16 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -161,7 +161,9 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_THREAD Q_GLOBAL_STATIC(QThreadStorage<QUnifiedTimer *>, unifiedTimer) +#endif QUnifiedTimer::QUnifiedTimer() : QObject(), lastTick(0), timingInterval(DEFAULT_TIMER_INTERVAL), @@ -173,12 +175,17 @@ QUnifiedTimer::QUnifiedTimer() : QUnifiedTimer *QUnifiedTimer::instance() { QUnifiedTimer *inst; +#ifndef QT_NO_THREAD if (!unifiedTimer()->hasLocalData()) { inst = new QUnifiedTimer; unifiedTimer()->setLocalData(inst); } else { inst = unifiedTimer()->localData(); } +#else + static QUnifiedTimer unifiedTimer; + inst = &unifiedTimer; +#endif return inst; } |