diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch deleted file mode 100644 index 84e5dbac..00000000 --- a/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ /dev/null @@ -1,30 +0,0 @@ -From f2092e73beaffe163a5c7f66f73956477f0d97a1 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Wed, 19 Mar 2014 18:32:28 +0100 -Subject: [PATCH 06/13] qeglplatformintegration: Undefine CursorShape from X.h - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -index 4d7adce..c9b6873 100644 ---- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -+++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -@@ -50,6 +50,12 @@ - #include <QtCore/QVariant> - #include <EGL/egl.h> - -+// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/ -+// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */ -+#ifdef CursorShape -+#undef CursorShape -+#endif -+ - QT_BEGIN_NAMESPACE - - class QEGLPlatformScreen; --- -2.3.1 - |