diff -r b72c6db6890b -r 5dc02b23752f src/gui/widgets/qscrollbar.cpp --- a/src/gui/widgets/qscrollbar.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/gui/widgets/qscrollbar.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -47,7 +47,7 @@ #include "qstyle.h" #include "qstyleoption.h" #include "qmenu.h" -#include +#include #ifndef QT_NO_SCROLLBAR @@ -523,6 +523,7 @@ break; #ifndef QT_NO_WHEELEVENT case QEvent::Wheel: { + event->ignore(); // override wheel event without adding virtual function override QWheelEvent *ev = static_cast(event); int delta = ev->delta(); @@ -612,7 +613,7 @@ } const int initialDelay = 500; // default threshold d->activateControl(d->pressedControl, initialDelay); - QTime time; + QElapsedTimer time; time.start(); repaint(style()->subControlRect(QStyle::CC_ScrollBar, &opt, d->pressedControl, this)); if (time.elapsed() >= initialDelay && d->repeatActionTimer.isActive()) {