From bd40a7cc446cafb8c9922d7d19845da580868859 Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@digia.com>
Date: Fri, 28 Mar 2014 16:22:14 +0100
Subject: Update bundled libxkbcommon version to 0.4.1

This is the latest version, released on Mar 27 2014. It includes:

https://bugs.freedesktop.org/show_bug.cgi?id=75798
https://bugs.freedesktop.org/show_bug.cgi?id=75892

Required for fixing input when running Qt application on Mac OS X
with XQuartz and for fixing QTBUG-36281.

Change-Id: Idc4d3c99a4008a10b91ab51c8910b36909974703
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/plugins/platforms/xcb/qxcbkeyboard.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/plugins/platforms/xcb/qxcbkeyboard.h')

diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.h b/src/plugins/platforms/xcb/qxcbkeyboard.h
index aefd9655ed..1acd466aeb 100644
--- a/src/plugins/platforms/xcb/qxcbkeyboard.h
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.h
@@ -48,10 +48,7 @@
 
 #include <xkbcommon/xkbcommon.h>
 #ifndef QT_NO_XKB
-// note: extern won't be needed from libxkbcommon 0.4.1 and above
-extern "C" {
 #include <xkbcommon/xkbcommon-x11.h>
-}
 #endif
 
 #include <QEvent>
-- 
cgit v1.2.3