mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 04:22:55 +01:00
db82ecbefe
6988a2f097e9af50e1b4222550b2593bfc5685ea build: Update qt package up to 5.15.10 (Hennadii Stepanov) Pull request description: The Qt 5.15.10 contains at least three important for us fixes: -8bb90ab760, which allows us to drop the [`dont_hardcode_x86_64.patch`](fd8ab08558/depends/patches/qt/dont_hardcode_x86_64.patch) -8467beddb7, which allows us to drop the [`fix_montery_include.patch`](fd8ab08558/depends/patches/qt/fix_montery_include.patch) -df08a21fa4, which addresses https://github.com/bitcoin/bitcoin/pull/28349#issuecomment-1743519614 ACKs for top commit: fanquake: ACK 6988a2f097e9af50e1b4222550b2593bfc5685ea. Tree-SHA512: 838c44cf0d7508714f35887bb1f0983e59d96764f08f467bbd03d102d7152e797daeedc178afb03141115cc3be623e4ef7c4c4c65c0a8d1f0bb9702c9a6f8fc6
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From 9563cef873ae82e06f60708d706d054717e801ce Mon Sep 17 00:00:00 2001
|
|
From: Carl Dong <contact@carldong.me>
|
|
Date: Thu, 18 Jul 2019 17:22:05 -0400
|
|
Subject: [PATCH] Wrap xlib related code blocks in #if's
|
|
|
|
They are not necessary to compile QT.
|
|
|
|
--- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
|
|
+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
|
|
@@ -49,7 +49,9 @@
|
|
#include <QtGui/QWindow>
|
|
#include <QtGui/QBitmap>
|
|
#include <QtGui/private/qguiapplication_p.h>
|
|
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
|
|
#include <X11/cursorfont.h>
|
|
+#endif
|
|
#include <xcb/xfixes.h>
|
|
#include <xcb/xcb_image.h>
|
|
|
|
@@ -391,6 +393,7 @@ void QXcbCursor::changeCursor(QCursor *cursor, QWindow *window)
|
|
xcb_flush(xcb_connection());
|
|
}
|
|
|
|
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
|
|
static int cursorIdForShape(int cshape)
|
|
{
|
|
int cursorId = 0;
|
|
@@ -444,6 +447,7 @@ static int cursorIdForShape(int cshape)
|
|
}
|
|
return cursorId;
|
|
}
|
|
+#endif
|
|
|
|
xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape)
|
|
{
|
|
@@ -558,7 +562,9 @@ static xcb_cursor_t loadCursor(void *dpy, int cshape)
|
|
xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
|
|
{
|
|
xcb_connection_t *conn = xcb_connection();
|
|
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
|
|
int cursorId = cursorIdForShape(cshape);
|
|
+#endif
|
|
xcb_cursor_t cursor = XCB_NONE;
|
|
|
|
#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
|
|
@@ -590,6 +596,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
|
|
// Non-standard X11 cursors are created from bitmaps
|
|
cursor = createNonStandardCursor(cshape);
|
|
|
|
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
|
|
// Create a glpyh cursor if everything else failed
|
|
if (!cursor && cursorId) {
|
|
cursor = xcb_generate_id(conn);
|
|
@@ -597,6 +604,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
|
|
cursorId, cursorId + 1,
|
|
0xFFFF, 0xFFFF, 0xFFFF, 0, 0, 0);
|
|
}
|
|
+#endif
|
|
|
|
if (cursor && cshape >= 0 && cshape < Qt::LastCursor && connection()->hasXFixes()) {
|
|
const char *name = cursorNames[cshape].front();
|