From d0cbd1e0b8f893bfb87f9b6ecd47b71e0a51bf8d Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 21 Oct 2015 16:12:27 +0200 Subject: [PATCH] eglfs: Avoid sending enter-leave events with an invalid leave ptr Task-number: QTBUG-48890 Change-Id: Iad82f285a0c982a5fafd276459b8177086d43d1b Reviewed-by: Andy Nichols --- src/plugins/platforms/eglfs/qeglfsscreen.cpp | 1 - src/plugins/platforms/eglfs/qeglfsscreen.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/qeglfsscreen.cpp index 22ec424451..6f8d0b88dd 100644 --- a/src/plugins/platforms/eglfs/qeglfsscreen.cpp +++ b/src/plugins/platforms/eglfs/qeglfsscreen.cpp @@ -45,7 +45,6 @@ QT_BEGIN_NAMESPACE QEglFSScreen::QEglFSScreen(EGLDisplay dpy) : m_dpy(dpy), - m_pointerWindow(0), m_surface(EGL_NO_SURFACE), m_cursor(0) { diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.h b/src/plugins/platforms/eglfs/qeglfsscreen.h index dc291285ad..44e9da4a5a 100644 --- a/src/plugins/platforms/eglfs/qeglfsscreen.h +++ b/src/plugins/platforms/eglfs/qeglfsscreen.h @@ -35,6 +35,7 @@ #define QEGLFSSCREEN_H #include "qeglfsglobal.h" +#include #include QT_BEGIN_NAMESPACE @@ -73,7 +74,7 @@ private: void setPrimarySurface(EGLSurface surface); EGLDisplay m_dpy; - QWindow *m_pointerWindow; + QPointer m_pointerWindow; EGLSurface m_surface; QPlatformCursor *m_cursor;