Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/widgets/qscrollbar.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    4848#include "qstyleoption.h"
    4949#include "qmenu.h"
    50 #include <QtCore/qdatetime.h>
     50#include <QtCore/qelapsedtimer.h>
    5151
    5252#ifndef QT_NO_SCROLLBAR
     
    524524#ifndef QT_NO_WHEELEVENT
    525525    case QEvent::Wheel: {
     526        event->ignore();
    526527        // override wheel event without adding virtual function override
    527528        QWheelEvent *ev = static_cast<QWheelEvent *>(event);
     
    613614    const int initialDelay = 500; // default threshold
    614615    d->activateControl(d->pressedControl, initialDelay);
    615     QTime time;
     616    QElapsedTimer time;
    616617    time.start();
    617618    repaint(style()->subControlRect(QStyle::CC_ScrollBar, &opt, d->pressedControl, this));
Note: See TracChangeset for help on using the changeset viewer.