diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:50:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-25 12:50:29 +0200 |
| commit | 9e04c60ac070348f8208fb0254e62d6e593320c3 (patch) | |
| tree | cd038cf2612faf8dadeae5fb8b807b66e2291026 /src/gui/kernel/qcursor_qpa.cpp | |
| parent | bfa8d15e15fdeb0bbfb6575e37be1c32445ab7cc (diff) | |
| parent | 04d0a9626ce61b2e05a40f9562c2bcf12e234639 (diff) | |
Merge "Merge branch 'master' into refactor" into refactor
Diffstat (limited to 'src/gui/kernel/qcursor_qpa.cpp')
| -rw-r--r-- | src/gui/kernel/qcursor_qpa.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gui/kernel/qcursor_qpa.cpp b/src/gui/kernel/qcursor_qpa.cpp index a2927601a9..65d5b0f650 100644 --- a/src/gui/kernel/qcursor_qpa.cpp +++ b/src/gui/kernel/qcursor_qpa.cpp @@ -108,19 +108,11 @@ void QCursorData::update() #endif //QT_NO_CURSOR -extern int qt_last_x; -extern int qt_last_y; +extern qreal qt_last_x,qt_last_y; QPoint QCursor::pos() { - QList<QWeakPointer<QPlatformCursor> > cursors = QPlatformCursorPrivate::getInstances(); - int cursorCount = cursors.count(); - for (int i = 0; i < cursorCount; ++i) { - const QWeakPointer<QPlatformCursor> &cursor(cursors.at(i)); - if (cursor) - return cursor.data()->pos(); - } - return QPoint(qt_last_x, qt_last_y); + return QPointF(qt_last_x, qt_last_y).toPoint(); } void QCursor::setPos(int x, int y) |