Liang Qi 4159ee8405 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: config.tests/unix/ptrsize.test configure src/corelib/global/qnamespace.h src/network/socket/qabstractsocket.cpp tests/auto/other/networkselftest/networkselftest.pro Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672		2015-11-04 20:18:14 +01:00
..
compose	Pretend the X11 "compose" platform input context plugin to be "xim" too	2015-09-21 16:39:15 +00:00
ibus	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
platforminputcontexts.pro	Update bundled libxkbcommon version to 0.4.0	2014-03-19 15:42:13 +01:00