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
..
accessibility	Android: Delay initialization of Accessibility.	2015-06-09 09:06:39 +00:00
jar	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
java	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
templates	Android: Add opt-in high-dpi support	2015-10-26 09:27:54 +00:00
android.pro	Do not initialize accessibility code by default on startup.	2014-12-09 16:59:03 +01:00