Changeset 846 for trunk/src/gui/widgets/qscrollbar.cpp
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/widgets/qscrollbar.cpp
r769 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 48 48 #include "qstyleoption.h" 49 49 #include "qmenu.h" 50 #include <QtCore/q datetime.h>50 #include <QtCore/qelapsedtimer.h> 51 51 52 52 #ifndef QT_NO_SCROLLBAR … … 524 524 #ifndef QT_NO_WHEELEVENT 525 525 case QEvent::Wheel: { 526 event->ignore(); 526 527 // override wheel event without adding virtual function override 527 528 QWheelEvent *ev = static_cast<QWheelEvent *>(event); … … 613 614 const int initialDelay = 500; // default threshold 614 615 d->activateControl(d->pressedControl, initialDelay); 615 Q Timetime;616 QElapsedTimer time; 616 617 time.start(); 617 618 repaint(style()->subControlRect(QStyle::CC_ScrollBar, &opt, d->pressedControl, this));
Note:
See TracChangeset
for help on using the changeset viewer.