diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-30 13:39:48 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-30 13:39:48 (GMT) |
| commit | 6a907f37d698eadc9cc35712b9cda48ba19e634d (patch) | |
| tree | d1df866f6a19901f5fe0431e5609cfc2d02484a9 /src/corelib/animation/qabstractanimation.cpp | |
| parent | 8097fa53b5e0e6228bd5737de6de8cd77c04dddf (diff) | |
| parent | 8c4edbd04f350294462fd689748de2dd7cc84d47 (diff) | |
| download | Qt-6a907f37d698eadc9cc35712b9cda48ba19e634d.zip Qt-6a907f37d698eadc9cc35712b9cda48ba19e634d.tar.gz Qt-6a907f37d698eadc9cc35712b9cda48ba19e634d.tar.bz2 | |
Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstream
Diffstat (limited to 'src/corelib/animation/qabstractanimation.cpp')
| -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 b8b9214..a4c7e29 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 |