From 0c5e2328284e97a293e1153c6ad1bcd2706e044a Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Wed, 5 Dec 2012 11:42:58 +0100 Subject: Compile with QT_NO_CURSOR. Mostly straightforward, the a11y changes might look a bit drastic, but the base class QAccessibleTextWidget was already disabled in this case, so we have to obviously take out its sub-classes as well. Change-Id: I682ace20d6938688ddb1da23c3463f3c025fab8e Reviewed-by: Marc Mutz Reviewed-by: Tasuku Suzuki Reviewed-by: Frederik Gladhorn Reviewed-by: Lars Knoll Reviewed-by: Nicolas Arnaud-Cormos --- src/platformsupport/fbconvenience/qfbcursor.cpp | 2 ++ src/platformsupport/fbconvenience/qfbcursor_p.h | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src/platformsupport/fbconvenience') diff --git a/src/platformsupport/fbconvenience/qfbcursor.cpp b/src/platformsupport/fbconvenience/qfbcursor.cpp index f3b8ecbf50..bc44055721 100644 --- a/src/platformsupport/fbconvenience/qfbcursor.cpp +++ b/src/platformsupport/fbconvenience/qfbcursor.cpp @@ -116,6 +116,7 @@ void QFbCursor::setCursor(const uchar *data, const uchar *mask, int width, int h mGraphic->set(data, mask, width, height, hotX, hotY); } +#ifndef QT_NO_CURSOR void QFbCursor::changeCursor(QCursor * widgetCursor, QWindow *window) { Q_UNUSED(window); @@ -134,6 +135,7 @@ void QFbCursor::changeCursor(QCursor * widgetCursor, QWindow *window) if (mOnScreen || mScreen->geometry().intersects(mCurrentRect.translated(mScreenOffset))) setDirty(); } +#endif QT_END_NAMESPACE diff --git a/src/platformsupport/fbconvenience/qfbcursor_p.h b/src/platformsupport/fbconvenience/qfbcursor_p.h index 9468e647aa..a56e352533 100644 --- a/src/platformsupport/fbconvenience/qfbcursor_p.h +++ b/src/platformsupport/fbconvenience/qfbcursor_p.h @@ -59,7 +59,9 @@ public: // input methods virtual void pointerEvent(const QMouseEvent &event); +#ifndef QT_NO_CURSOR virtual void changeCursor(QCursor *widgetCursor, QWindow *window); +#endif virtual void setDirty() { mDirty = true; /* screen->setDirty(QRect()); */ } virtual bool isDirty() const { return mDirty; } -- cgit v1.2.3