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
..
arch	Updated license headers	2016-01-15 12:25:24 +00:00
common	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
mac/corewlan	Updated license headers	2016-01-15 12:25:24 +00:00
qpa	Updated license headers	2016-01-15 12:25:24 +00:00
unix	Updated license headers	2016-01-15 12:25:24 +00:00
win/directwrite	Updated license headers	2016-01-15 12:25:24 +00:00
x11	Updated license headers	2016-01-15 12:25:24 +00:00
.gitignore	…
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00