diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-02-02 06:26:58 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-02-02 06:26:58 (GMT) |
| commit | a882f1a1d61c4406cc2968c325b7f6b06ef17b95 (patch) | |
| tree | 76e8f3034781b5696bbad541f90bb91607787a3c /src | |
| parent | ebc0ad51ab319aefd88939963ecf172867b36f5a (diff) | |
| parent | ac5e89a2fd94c4eb45e79e2c19b3ef5e9b240cb9 (diff) | |
| download | Qt-a882f1a1d61c4406cc2968c325b7f6b06ef17b95.zip Qt-a882f1a1d61c4406cc2968c325b7f6b06ef17b95.tar.gz Qt-a882f1a1d61c4406cc2968c325b7f6b06ef17b95.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index ba5e12c..87578b4 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -876,7 +876,7 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event) Q_D(QDeclarativeFlickable); if (!d->interactive) { QDeclarativeItem::wheelEvent(event); - } else if (yflick()) { + } else if (yflick() && event->orientation() == Qt::Vertical) { if (event->delta() > 0) d->vData.velocity = qMax(event->delta() - d->vData.smoothVelocity.value(), qreal(250.0)); else @@ -888,7 +888,7 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event) movementStarting(); } event->accept(); - } else if (xflick()) { + } else if (xflick() && event->orientation() == Qt::Horizontal) { if (event->delta() > 0) d->hData.velocity = qMax(event->delta() - d->hData.smoothVelocity.value(), qreal(250.0)); else |