diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-07-03 10:51:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 07:22:54 +0200 |
| commit | e1b3ad7c831023c3e336414a16b69773adea4e26 (patch) | |
| tree | be550c96f3265c8ca3dba89a2ea033c50238cfee /src/quick/items/qquickcanvas.cpp | |
| parent | 01173fd0c09e51ca949df51fac2fa7e439e466d1 (diff) | |
Fix some commented issues from the refactor merge.
Change-Id: Ied56bdfc93162b7668be7b07841948b8b5968a70
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickcanvas.cpp')
| -rw-r--r-- | src/quick/items/qquickcanvas.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp index 37c238fd21..a242ca1111 100644 --- a/src/quick/items/qquickcanvas.cpp +++ b/src/quick/items/qquickcanvas.cpp @@ -537,10 +537,6 @@ Translates the data in \a touchEvent to this canvas. This method leaves the ite */ void QQuickCanvasPrivate::translateTouchEvent(QTouchEvent *touchEvent) { -// Q_Q(QQuickCanvas); - -// touchEvent->setWidget(q); // ### refactor... - QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->touchPoints(); for (int i = 0; i < touchPoints.count(); ++i) { QTouchEvent::TouchPoint &touchPoint = touchPoints[i]; @@ -1055,10 +1051,11 @@ QQuickItem *QQuickCanvas::mouseGrabberItem() const bool QQuickCanvasPrivate::clearHover() { + Q_Q(QQuickCanvas); if (hoverItems.isEmpty()) return false; - QPointF pos = QGuiApplicationPrivate::lastCursorPosition;; // ### refactor: q->mapFromGlobal(QCursor::pos()); + QPointF pos = q->mapFromGlobal(QGuiApplicationPrivate::lastCursorPosition.toPoint()); bool accepted = false; foreach (QQuickItem* item, hoverItems) |