diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-09 11:57:14 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-09 11:57:14 (GMT) |
| commit | 662f87ad52ea75229ce18b19983890425cc45298 (patch) | |
| tree | 67b1764083e54f017e0d318c63c152af40307ad9 /src/declarative/graphicsitems/qdeclarativepathview.cpp | |
| parent | eea84818e98af917d3cf2bf04ea17a416ef9d55e (diff) | |
| parent | 7829343dc9e12befd6c471cc72d00139bad5d42b (diff) | |
| download | Qt-662f87ad52ea75229ce18b19983890425cc45298.zip Qt-662f87ad52ea75229ce18b19983890425cc45298.tar.gz Qt-662f87ad52ea75229ce18b19983890425cc45298.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepathview.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepathview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 06ac275..5771f84 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -1061,7 +1061,7 @@ void QDeclarativePathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (!d->stealMouse) { QPointF delta = event->pos() - d->startPoint; - if (qAbs(delta.x()) > QApplication::startDragDistance() && qAbs(delta.y()) > QApplication::startDragDistance()) + if (qAbs(delta.x()) > QApplication::startDragDistance() || qAbs(delta.y()) > QApplication::startDragDistance()) d->stealMouse = true; } |