From eb149ec95c2c70b44ec993f5f051f4daaecae7fd Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 9 Oct 2015 22:06:58 +0000 Subject: Offscreen: Protect against the QT_NO_CURSOR define for changeCursor If QT_NO_CURSOR is defined then changeCursor() is not implemented in QPlatformCursor which means that it isn't really being overridden in the offscreen plugin. Therefore the same define is checked for to prevent a compiler from having a problem with it. Change-Id: Id7c104292354cb7462b3161602fc8d382a6dd390 Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/plugins/platforms/offscreen/qoffscreencommon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.cpp b/src/plugins/platforms/offscreen/qoffscreencommon.cpp index 11977fc6ed..31d7397f6f 100644 --- a/src/plugins/platforms/offscreen/qoffscreencommon.cpp +++ b/src/plugins/platforms/offscreen/qoffscreencommon.cpp @@ -75,13 +75,13 @@ public: QOffscreenScreen::windowContainingCursor = containing ? containing->handle() : 0; } - +#ifndef QT_NO_CURSOR void changeCursor(QCursor *windowCursor, QWindow *window) Q_DECL_OVERRIDE { Q_UNUSED(windowCursor); Q_UNUSED(window); } - +#endif private: QPoint m_pos; }; -- cgit v1.2.3