diff options
author | Volker Krause <volker.krause@kdab.com> | 2012-12-05 11:42:58 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-07 08:46:15 +0100 |
commit | 0c5e2328284e97a293e1153c6ad1bcd2706e044a (patch) | |
tree | 52d5f899cfc3f185882a26923185df9ca8632154 /src/platformsupport | |
parent | 425367f89255764234313889b403bf53b0993e0a (diff) |
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 <marc.mutz@kdab.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Diffstat (limited to 'src/platformsupport')
-rw-r--r-- | src/platformsupport/dnd/qsimpledrag.cpp | 2 | ||||
-rw-r--r-- | src/platformsupport/fbconvenience/qfbcursor.cpp | 2 | ||||
-rw-r--r-- | src/platformsupport/fbconvenience/qfbcursor_p.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/platformsupport/dnd/qsimpledrag.cpp b/src/platformsupport/dnd/qsimpledrag.cpp index 18e6b97e3c..efaede4c5f 100644 --- a/src/platformsupport/dnd/qsimpledrag.cpp +++ b/src/platformsupport/dnd/qsimpledrag.cpp @@ -237,6 +237,7 @@ void QBasicDrag::exitDndEventLoop() void QBasicDrag::updateCursor(Qt::DropAction action) { +#ifndef QT_NO_CURSOR Qt::CursorShape cursorShape = Qt::ForbiddenCursor; if (canDrop()) { switch (action) { @@ -267,6 +268,7 @@ void QBasicDrag::updateCursor(Qt::DropAction action) } } } +#endif updateAction(action); } 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; } |