@@ -22,23 +22,23 @@ index 7c62c2e2b3..c05c6c0a07 100644
22
22
#include <xcb/xfixes.h>
23
23
#include <xcb/xcb_image.h>
24
24
25
- @@ -384 ,6 +386 ,7 @@ void QXcbCursor::changeCursor(QCursor *cursor, QWindow *widget )
26
- w->setCursor(c, isBitmapCursor );
25
+ @@ -391 ,6 +393 ,7 @@ void QXcbCursor::changeCursor(QCursor *cursor, QWindow *window )
26
+ xcb_flush(xcb_connection() );
27
27
}
28
28
29
29
+ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
30
30
static int cursorIdForShape(int cshape)
31
31
{
32
32
int cursorId = 0;
33
- @@ -437 ,6 +440 ,7 @@ static int cursorIdForShape(int cshape)
33
+ @@ -444 ,6 +447 ,7 @@ static int cursorIdForShape(int cshape)
34
34
}
35
35
return cursorId;
36
36
}
37
37
+ #endif
38
38
39
39
xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape)
40
40
{
41
- @@ -558 ,7 +562 ,9 @@ static xcb_cursor_t loadCursor(void *dpy, int cshape)
41
+ @@ -556 ,7 +560 ,9 @@ static xcb_cursor_t loadCursor(void *dpy, int cshape)
42
42
xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
43
43
{
44
44
xcb_connection_t *conn = xcb_connection();
@@ -48,22 +48,23 @@ index 7c62c2e2b3..c05c6c0a07 100644
48
48
xcb_cursor_t cursor = XCB_NONE;
49
49
50
50
// Try Xcursor first
51
- @@ -589,6 +595,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
51
+ @@ -585,7 +591,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
52
+
52
53
// Non-standard X11 cursors are created from bitmaps
53
54
cursor = createNonStandardCursor(cshape);
54
-
55
+ -
55
56
+ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
56
57
// Create a glpyh cursor if everything else failed
57
58
if (!cursor && cursorId) {
58
59
cursor = xcb_generate_id(conn);
59
- @@ -596 ,6 +603 ,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
60
+ @@ -593 ,6 +599 ,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
60
61
cursorId, cursorId + 1,
61
62
0xFFFF, 0xFFFF, 0xFFFF, 0, 0, 0);
62
63
}
63
64
+ #endif
64
65
65
66
if (cursor && cshape >= 0 && cshape < Qt::LastCursor && connection()->hasXFixes()) {
66
- const char *name = cursorNames[cshape];
67
+ const char *name = cursorNames[cshape].front() ;
67
68
- -
68
69
2.22.0
69
70
0 commit comments