Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/corelib/json/qjsonwriter.cpp
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/xcb/qxcbkeyboard.cpp

Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62

1 files changed, 7 insertions, 0 deletions

diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index 400f7aece8..f746207cc0 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -49,7 +49,10 @@
 #include <QtCore/QString>
 
 #include <xkbcommon/xkbcommon.h>
+
+#ifdef XKBCOMMON_0_2_0
 #include <xkbcommon_workaround.h>
+#endif
 
 //#define DEBUG_GENERATOR
 
@@ -258,6 +261,7 @@ ushort TableGenerator::keysymToUtf8(quint32 sym)
     int bytes;
     chars.resize(8);
 
+#ifdef XKBCOMMON_0_2_0
     if (needWorkaround(sym)) {
         quint32 codepoint;
         if (sym == XKB_KEY_KP_Space)
@@ -269,6 +273,9 @@ ushort TableGenerator::keysymToUtf8(quint32 sym)
     } else {
         bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size());
     }
+#else
+    bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size());
+#endif
 
     if (bytes == -1)
         qWarning("TableGenerator::keysymToUtf8 - buffer too small");