diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-07 15:38:45 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-08 14:47:22 +0200 |
| commit | 4469de4ce7a72ab6824629bfe8483131aaf22137 (patch) | |
| tree | cc5b1c11c0681975e972f2d6aeab80e106d328c8 /src/plugins/platforms/xcb/xcb.pro | |
| parent | 88f3b059a935d1ce7735a5ae082c256619eea8c1 (diff) | |
Cursor support in xcb plug-in.
Custom cursor pixmaps with depth greater than 1 are not yet supported
and will be converted to monochrome always.
Reviewed-by: Samuel Rødal
Diffstat (limited to 'src/plugins/platforms/xcb/xcb.pro')
| -rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index 2f70b659c9..0d9e969ddc 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -17,7 +17,9 @@ SOURCES = \ qxcbwindowsurface.cpp \ qxcbwmsupport.cpp \ main.cpp \ - qxcbnativeinterface.cpp + qxcbnativeinterface.cpp \ + qxcbcursor.cpp \ + qxcbimage.cpp HEADERS = \ qxcbclipboard.h \ @@ -31,16 +33,21 @@ HEADERS = \ qxcbwindow.h \ qxcbwindowsurface.h \ qxcbwmsupport.h \ - qxcbnativeinterface.h + qxcbnativeinterface.h \ + qxcbcursor.h \ + qxcbimage.h QT += gui-private core-private +# needed by GLX, Xcursor, ... +DEFINES += XCB_USE_XLIB + contains(QT_CONFIG, opengl) { QT += opengl # DEFINES += XCB_USE_DRI2 contains(DEFINES, XCB_USE_DRI2) { - LIBS += -lxcb-dri2 -lxcb-xfixes -lEGL + LIBS += -lxcb-dri2 -lEGL CONFIG += link_pkgconfig PKGCONFIG += libdrm @@ -49,9 +56,6 @@ contains(QT_CONFIG, opengl) { SOURCES += qdri2context.cpp } else { - DEFINES += XCB_USE_XLIB - LIBS += -lX11 -lX11-xcb - contains(QT_CONFIG, opengles2) { DEFINES += XCB_USE_EGL load(qpa/egl/convenience) @@ -68,7 +72,8 @@ contains(QT_CONFIG, opengl) { } } -LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync +LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync -lxcb-xfixes +contains(DEFINES, XCB_USE_XLIB): LIBS += -lX11 -lX11-xcb DEFINES += $$QMAKE_DEFINES_XCB LIBS += $$QMAKE_LIBS_XCB |