diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-07-25 10:02:09 +0300 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-25 14:57:29 +0200 |
| commit | d78a6773050d0abb5b211a33f688abbb2eb43f53 (patch) | |
| tree | 68d73d1ce16c3a49b50a7fe59796aa867aa45b55 | |
| parent | c3da77798b876716ce038a30e9aa8517ec158c47 (diff) | |
Fix for not calling QPlatformCursor's pointerEvent.
The code to pass mouse events to platform cursors is there in 4.8,
however it went missing in refactor. This patch restores it.
Change-Id: I7873c892c1ae907fc084d3f00f7d4e5a6293ba4d
Reviewed-on: http://codereview.qt.nokia.com/2083
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index a54dab6398..b44503141e 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -62,6 +62,9 @@ #include "private/qwindow_p.h" #include "private/qkeymapper_p.h" #include "private/qcursor_p.h" +#ifndef QT_NO_CURSOR +#include "qplatformcursor_qpa.h" +#endif #include <QtGui/QPixmap> @@ -570,6 +573,12 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo if (window) { QMouseEvent ev(type, localPoint, globalPoint, button, buttons, QGuiApplication::keyboardModifiers()); +#ifndef QT_NO_CURSOR + QList<QWeakPointer<QPlatformCursor> > cursors = QPlatformCursorPrivate::getInstances(); + for (int i = 0; i < cursors.count(); ++i) + if (cursors.at(i)) + cursors.at(i).data()->pointerEvent(ev); +#endif QGuiApplication::sendSpontaneousEvent(window, &ev); return; } |