diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /src/plugins/platforms/xcb/qxcbcursor.h | |
parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbcursor.h')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbcursor.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h index 4bbb99e802..081300868c 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.h +++ b/src/plugins/platforms/xcb/qxcbcursor.h @@ -72,6 +72,13 @@ private: QMap<int, xcb_cursor_t> m_shapeCursorMap; QMap<qint64, xcb_cursor_t> m_bitmapCursorMap; #endif +#ifdef XCB_USE_XLIB + static void cursorThemePropertyChanged(QXcbScreen *screen, + const QByteArray &name, + const QVariant &property, + void *handle); +#endif + bool m_gtkCursorThemeInitialized; }; QT_END_NAMESPACE |