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/xcb | |
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/xcb')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbcursor.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbcursor.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp index c1cfbd02d6..e1dfe3d6c0 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp @@ -291,6 +291,7 @@ QXcbCursor::~QXcbCursor() xcb_close_font(xcb_connection(), cursorFont); } +#ifndef QT_NO_CURSOR void QXcbCursor::changeCursor(QCursor *cursor, QWindow *widget) { QXcbWindow *w = 0; @@ -507,6 +508,7 @@ xcb_cursor_t QXcbCursor::createBitmapCursor(QCursor *cursor) } return c; } +#endif void QXcbCursor::queryPointer(QXcbConnection *c, xcb_window_t *rootWin, QPoint *pos, int *keybMask) { diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h index 4c74034988..a4f3bf11ee 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.h +++ b/src/plugins/platforms/xcb/qxcbcursor.h @@ -52,20 +52,26 @@ class QXcbCursor : public QXcbObject, public QPlatformCursor public: QXcbCursor(QXcbConnection *conn, QXcbScreen *screen); ~QXcbCursor(); +#ifndef QT_NO_CURSOR void changeCursor(QCursor *cursor, QWindow *widget); +#endif QPoint pos() const; void setPos(const QPoint &pos); static void queryPointer(QXcbConnection *c, xcb_window_t *rootWin, QPoint *pos, int *keybMask = 0); private: +#ifndef QT_NO_CURSOR xcb_cursor_t createFontCursor(int cshape); xcb_cursor_t createBitmapCursor(QCursor *cursor); xcb_cursor_t createNonStandardCursor(int cshape); +#endif QXcbScreen *m_screen; +#ifndef QT_NO_CURSOR QMap<int, xcb_cursor_t> m_shapeCursorMap; QMap<qint64, xcb_cursor_t> m_bitmapCursorMap; +#endif }; QT_END_NAMESPACE |