Skip to content

Commit 6093ae4

Browse files
committed
build: update qt no-xlib patch for 5.12.10
1 parent 84928c4 commit 6093ae4

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

depends/patches/qt/no-xlib.patch

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ index 7c62c2e2b3..c05c6c0a07 100644
2222
#include <xcb/xfixes.h>
2323
#include <xcb/xcb_image.h>
2424

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());
2727
}
2828

2929
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
3030
static int cursorIdForShape(int cshape)
3131
{
3232
int cursorId = 0;
33-
@@ -437,6 +440,7 @@ static int cursorIdForShape(int cshape)
33+
@@ -444,6 +447,7 @@ static int cursorIdForShape(int cshape)
3434
}
3535
return cursorId;
3636
}
3737
+#endif
3838

3939
xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape)
4040
{
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)
4242
xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
4343
{
4444
xcb_connection_t *conn = xcb_connection();
@@ -48,22 +48,23 @@ index 7c62c2e2b3..c05c6c0a07 100644
4848
xcb_cursor_t cursor = XCB_NONE;
4949

5050
// 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+
5253
// Non-standard X11 cursors are created from bitmaps
5354
cursor = createNonStandardCursor(cshape);
54-
55+
-
5556
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
5657
// Create a glpyh cursor if everything else failed
5758
if (!cursor && cursorId) {
5859
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)
6061
cursorId, cursorId + 1,
6162
0xFFFF, 0xFFFF, 0xFFFF, 0, 0, 0);
6263
}
6364
+#endif
6465

6566
if (cursor && cshape >= 0 && cshape < Qt::LastCursor && connection()->hasXFixes()) {
66-
const char *name = cursorNames[cshape];
67+
const char *name = cursorNames[cshape].front();
6768
--
6869
2.22.0
6970

0 commit comments

Comments
 (0)