diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-05 08:52:24 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-05 08:52:24 (GMT) |
| commit | 6d25d222b2bb418139e123b59366db908ee3188a (patch) | |
| tree | e00b67dcf860d5cd9bcdcaccf8bfc56f55269e94 /src/corelib/animation/qabstractanimation.cpp | |
| parent | cea8678e5fca8b33bbd5da057282888bc260a5c9 (diff) | |
| parent | e50916796adc0dee112505ed617f9b83e99526fb (diff) | |
| download | Qt-6d25d222b2bb418139e123b59366db908ee3188a.zip Qt-6d25d222b2bb418139e123b59366db908ee3188a.tar.gz Qt-6d25d222b2bb418139e123b59366db908ee3188a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'src/corelib/animation/qabstractanimation.cpp')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 61d61df..fcc63a4 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -142,8 +142,6 @@ \sa direction */ -#ifndef QT_NO_ANIMATION - #include "qabstractanimation.h" #include "qanimationgroup.h" #include <QtCore/qdebug.h> @@ -155,6 +153,8 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qpointer.h> +#ifndef QT_NO_ANIMATION + #define DEFAULT_TIMER_INTERVAL 16 QT_BEGIN_NAMESPACE |