diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-08-30 13:17:00 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-01 13:35:08 +0200 |
commit | 1259c5768e410361bcd8b5cf0c2057a2ebabda83 (patch) | |
tree | 4cb0444f1272506fd0cc788d45fccf601138ef72 /src/declarative/items/qsgflickable.cpp | |
parent | e4ba808305952dd313b495f20300ec6e2c3801ac (diff) |
Remove the remaining dependencies onto QtWidgets
Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8
Reviewed-on: http://codereview.qt.nokia.com/3992
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgflickable.cpp')
-rw-r--r-- | src/declarative/items/qsgflickable.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/items/qsgflickable.cpp b/src/declarative/items/qsgflickable.cpp index 92554f8e79..21474be8d9 100644 --- a/src/declarative/items/qsgflickable.cpp +++ b/src/declarative/items/qsgflickable.cpp @@ -46,7 +46,8 @@ #include <QtDeclarative/qdeclarativeinfo.h> #include <QtGui/qevent.h> -#include <QtWidgets/qapplication.h> +#include <QtGui/qguiapplication.h> +#include <QtGui/qstylehints.h> #include "qplatformdefs.h" QT_BEGIN_NAMESPACE @@ -821,7 +822,7 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event) if (q->yflick()) { int dy = int(event->localPos().y() - pressPos.y()); - if (qAbs(dy) > QApplication::startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) { + if (qAbs(dy) > qApp->styleHints()->startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) { if (!vMoved) vData.dragStartOffset = dy; qreal newY = dy + vData.pressPos - vData.dragStartOffset; @@ -846,14 +847,14 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event) vData.move.setValue(qRound(newY)); vMoved = true; } - if (qAbs(dy) > QApplication::startDragDistance()) + if (qAbs(dy) > qApp->styleHints()->startDragDistance()) stealY = true; } } if (q->xflick()) { int dx = int(event->localPos().x() - pressPos.x()); - if (qAbs(dx) > QApplication::startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) { + if (qAbs(dx) > qApp->styleHints()->startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) { if (!hMoved) hData.dragStartOffset = dx; qreal newX = dx + hData.pressPos - hData.dragStartOffset; @@ -879,7 +880,7 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event) hMoved = true; } - if (qAbs(dx) > QApplication::startDragDistance()) + if (qAbs(dx) > qApp->styleHints()->startDragDistance()) stealX = true; } } |