diff -Nru qtbase-opensource-src-5.4.1+dfsg/debian/changelog qtbase-opensource-src-5.4.1+dfsg/debian/changelog --- qtbase-opensource-src-5.4.1+dfsg/debian/changelog 2015-03-12 09:34:30.000000000 +0000 +++ qtbase-opensource-src-5.4.1+dfsg/debian/changelog 2015-03-31 09:19:37.000000000 +0000 @@ -1,3 +1,11 @@ +qtbase-opensource-src (5.4.1+dfsg-2ubuntu4) vivid; urgency=medium + + * debian/patches/upstream_xcb_use_themed_cursor.patch: + - backport upstream fix to use properly themed cursors under x11 + (lp: #1277020) + + -- Sebastien Bacher Tue, 31 Mar 2015 11:19:32 +0200 + qtbase-opensource-src (5.4.1+dfsg-2ubuntu3) vivid; urgency=medium * New upstream release. (LP: #1427560) diff -Nru qtbase-opensource-src-5.4.1+dfsg/debian/patches/series qtbase-opensource-src-5.4.1+dfsg/debian/patches/series --- qtbase-opensource-src-5.4.1+dfsg/debian/patches/series 2015-03-12 09:34:30.000000000 +0000 +++ qtbase-opensource-src-5.4.1+dfsg/debian/patches/series 2015-03-31 09:11:03.000000000 +0000 @@ -27,3 +27,4 @@ upstream_xcb-Update-mouse-buttons-from-MotionNotify-events.patch upstream-gerrit_Handle-SelectionWindowDestroy-in-QXcbClipboard.patch upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch +upstream_xcb_use_themed_cursor.patch diff -Nru qtbase-opensource-src-5.4.1+dfsg/debian/patches/upstream_xcb_use_themed_cursor.patch qtbase-opensource-src-5.4.1+dfsg/debian/patches/upstream_xcb_use_themed_cursor.patch --- qtbase-opensource-src-5.4.1+dfsg/debian/patches/upstream_xcb_use_themed_cursor.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtbase-opensource-src-5.4.1+dfsg/debian/patches/upstream_xcb_use_themed_cursor.patch 2015-03-31 09:10:17.000000000 +0000 @@ -0,0 +1,47 @@ +From c7b003ea3b8b4b7124d4971df7d910f2bc3fc4fa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B8rgen=20Lind?= +Date: Mon, 30 Mar 2015 12:03:30 +0200 +Subject: [PATCH 03/16] Use Xlib to resolve font cursor if possible + +before fallingback to uploading a bitmap cursor + +Task-number: QTBUG-30016 +Change-Id: I53eeda6bb5f6cab66e3bc10a2e5382ce55cc1bab +Reviewed-by: Laszlo Agocs +--- + src/plugins/platforms/xcb/qxcbcursor.cpp | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index e3a04c1..8dd27ec 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -53,6 +53,12 @@ typedef int (*PtrXcursorLibrarySetTheme)(void *, const char *); + typedef int (*PtrXcursorLibraryGetDefaultSize)(void *); + + #ifdef XCB_USE_XLIB ++#include ++enum { ++ XCursorShape = CursorShape ++}; ++#undef CursorShape ++ + static PtrXcursorLibraryLoadCursor ptrXcursorLibraryLoadCursor = 0; + static PtrXcursorLibraryGetTheme ptrXcursorLibraryGetTheme = 0; + static PtrXcursorLibrarySetTheme ptrXcursorLibrarySetTheme = 0; +@@ -552,6 +558,12 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape) + } + if (cursor) + return cursor; ++ if (!cursor && cursorId) { ++ cursor = XCreateFontCursor(DISPLAY_FROM_XCB(this), cursorId); ++ if (cursor) ++ return cursor; ++ } ++ + #endif + + // Non-standard X11 cursors are created from bitmaps +-- +2.1.4 +