diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-04 05:22:24 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-04 05:22:24 (GMT) |
| commit | ec502c9e9a26f984023e4f08126e033a504970b2 (patch) | |
| tree | 3082b195068a450b3844285f0f77ffe6fb32dc3c /src/corelib/animation | |
| parent | 3a369d590c04e9528265c6bf2dd33f8606df8ea5 (diff) | |
| parent | 69b4b690cc26b697675264298623d9974cc76796 (diff) | |
| download | Qt-ec502c9e9a26f984023e4f08126e033a504970b2.zip Qt-ec502c9e9a26f984023e4f08126e033a504970b2.tar.gz Qt-ec502c9e9a26f984023e4f08126e033a504970b2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/animation')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index fc124d9..948a084 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -157,19 +157,7 @@ #ifndef QT_NO_ANIMATION #define DEFAULT_TIMER_INTERVAL 16 - -#ifdef Q_WS_WIN - /// Fix for Qt 4.7 - //on windows if you're currently dragging a widget an inner eventloop was started by the system - //to make sure that this timer is getting fired, we need to make sure to use the system timers - //that will send a WM_TIMER event. We do that by settings the timer interval to 11 - //It is 16 because QEventDispatcherWin32Private::registerTimer specifically checks if the interval - //is greater than 11 to determine if it should use a system timer (or the multimedia timer). -#define STARTSTOP_TIMER_DELAY 16 -#else #define STARTSTOP_TIMER_DELAY 0 -#endif - QT_BEGIN_NAMESPACE |