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/plugins/platforms/directfb | |
| 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/plugins/platforms/directfb')
| -rw-r--r-- | src/plugins/platforms/directfb/qdirectfbcursor.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/directfb/qdirectfbcursor.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.cpp b/src/plugins/platforms/directfb/qdirectfbcursor.cpp index 1ff71f3e63..b04848ec40 100644 --- a/src/plugins/platforms/directfb/qdirectfbcursor.cpp +++ b/src/plugins/platforms/directfb/qdirectfbcursor.cpp @@ -47,9 +47,12 @@ QT_BEGIN_NAMESPACE QDirectFBCursor::QDirectFBCursor(QPlatformScreen *screen) : m_screen(screen) { +#ifndef QT_NO_CURSOR m_image.reset(new QPlatformCursorImage(0, 0, 0, 0, 0, 0)); +#endif } +#ifndef QT_NO_CURSOR void QDirectFBCursor::changeCursor(QCursor *cursor, QWindow *) { int xSpot; @@ -82,5 +85,6 @@ void QDirectFBCursor::changeCursor(QCursor *cursor, QWindow *) layer->SetCursorShape(layer, surface, xSpot, ySpot); layer->SetCooperativeLevel(layer, DLSCL_SHARED); } +#endif QT_END_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.h b/src/plugins/platforms/directfb/qdirectfbcursor.h index bd11b97467..21f205a5a1 100644 --- a/src/plugins/platforms/directfb/qdirectfbcursor.h +++ b/src/plugins/platforms/directfb/qdirectfbcursor.h @@ -56,10 +56,14 @@ class QDirectFBCursor : public QPlatformCursor { public: QDirectFBCursor(QPlatformScreen *screen); +#ifndef QT_NO_CURSOR void changeCursor(QCursor *cursor, QWindow *window); +#endif private: +#ifndef QT_NO_CURSOR QScopedPointer<QPlatformCursorImage> m_image; +#endif QPlatformScreen *m_screen; }; |