diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-13 23:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-13 23:00:15 (GMT) |
| commit | 4b1664447940a4674d0551f626561a30cfa3ce8f (patch) | |
| tree | b2b9e8e74bfc52339ff2d95c0b927544567aeea9 /src/declarative/graphicsitems/qdeclarativeflickable.cpp | |
| parent | 21fd6c0d818f3f4a3efa8904c8ddbfeb3a1e931d (diff) | |
| parent | ff60c64c30a2e889b7a894b7b4b38484b7dfe31a (diff) | |
| download | Qt-4b1664447940a4674d0551f626561a30cfa3ce8f.zip Qt-4b1664447940a4674d0551f626561a30cfa3ce8f.tar.gz Qt-4b1664447940a4674d0551f626561a30cfa3ce8f.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
| -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 377f3b5..f1d92c5 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -700,8 +700,8 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent bool rejectY = false; bool rejectX = false; - bool stealY = false; - bool stealX = false; + bool stealY = stealMouse; + bool stealX = stealMouse; if (q->yflick()) { int dy = int(event->pos().y() - pressPos.y()); |