Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qsysinfo.h src/corelib/kernel/qcoreapplication_win.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/plugins/platforms/windows/qwindowsglcontext.cpp src/plugins/platforms/windows/qwindowsglcontext.h Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978		2016-06-21 08:39:41 +02:00
..
clientserver	Updated license headers	2016-01-21 18:55:18 +00:00
test	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-21 08:39:41 +02:00
udpServer	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-20 08:00:26 +02:00
qudpsocket.pro	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
tst_qudpsocket.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-12 08:33:08 +02:00