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
..
animation	qevent.h: Add fixme comments to remove include directives for Qt 6.	2015-10-02 06:37:03 +00:00
codecs	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
global	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
io	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
itemmodels	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-02 23:33:06 +01:00
json	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-08 12:35:24 +01:00
kernel	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
mimetypes	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-08 12:35:24 +01:00
plugin	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2015-11-05 08:27:56 +00:00
statemachine	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
thread	Remove all the atomic code besides MSVC and std::atomic	2016-01-19 23:41:52 +00:00
tools	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
xml	tests/auto/corelib: Remove some placeholder formatting.	2015-10-22 03:54:29 +00:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00