Liang Qi 158a3a4159 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qiodevice_p.h src/corelib/kernel/qvariant_p.h src/corelib/tools/qsimd.cpp src/gui/kernel/qguiapplication.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a		2016-01-21 08:17:21 +01:00
..
image	NEON optimized bilinear sampling	2015-12-17 01:11:57 +00:00
itemmodels	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
math3d	Tests: Fix single-character string literals.	2015-10-13 18:14:27 +00:00
painting	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
qopengl	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
qopenglconfig	Merge remote-tracking branch 'origin/5.6' into dev	2015-09-25 14:02:04 +02:00
text	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
util	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
gui.pro	Add qopenglconfig test.	2015-02-02 23:05:41 +00:00