diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-03-28 16:46:31 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-28 14:08:27 +0200 |
| commit | 7f5bbcbc3cbe0017538b986bcfa8c134e9e2572e (patch) | |
| tree | 227144ebb56254bbd2bb90386928fdab12b3402e /src | |
| parent | 1025b77fe09f010be71ac460475da144e742bf09 (diff) | |
Replace usage of QCursor, and update hoverVisible test.
QCursor::pos() doesn't work well with mouse events generated by the test
framework.
Change-Id: I62ee2228c194f21cf17f6271c662056a90c5ef2d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickcanvas.cpp | 3 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp index c9d7813a07..5a57a908b9 100644 --- a/src/quick/items/qquickcanvas.cpp +++ b/src/quick/items/qquickcanvas.cpp @@ -55,7 +55,6 @@ #include <private/qguiapplication_p.h> #include <QtGui/QInputMethod> -#include <QtGui/QCursor> #include <private/qabstractanimation_p.h> @@ -952,7 +951,7 @@ bool QQuickCanvasPrivate::clearHover() if (hoverItems.isEmpty()) return false; - QPointF pos = QCursor::pos(); // ### refactor: q->mapFromGlobal(QCursor::pos()); + QPointF pos = QGuiApplicationPrivate::lastCursorPosition;; // ### refactor: q->mapFromGlobal(QCursor::pos()); bool accepted = false; foreach (QQuickItem* item, hoverItems) diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 9eae661ed1..6eddd0d0ba 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -52,8 +52,8 @@ #include <QtQml/qqmlcomponent.h> #include <QtQml/qqmlinfo.h> #include <QtGui/qpen.h> -#include <QtGui/qcursor.h> #include <QtGui/qguiapplication.h> +#include <QtGui/private/qguiapplication_p.h> #include <QtGui/qinputmethod.h> #include <QtCore/qdebug.h> #include <QtCore/qcoreevent.h> @@ -4843,7 +4843,7 @@ bool QQuickItem::isUnderMouse() const if (!d->canvas) return false; - QPoint cursorPos = QCursor::pos(); + QPointF cursorPos = QGuiApplicationPrivate::lastCursorPosition; if (QRectF(0, 0, width(), height()).contains(mapFromScene(cursorPos))) // ### refactor: d->canvas->mapFromGlobal(cursorPos)))) return true; return false; |