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
..
socketprocess	Update copyright headers	2015-02-11 06:49:51 +00:00
test	QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2014-02-25 16:47:13 +01:00
.gitignore	tst_qlocalsocket: get rid of QtScript dependency	2012-10-19 02:43:05 +02:00
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qlocalsocket.pro	tst_qlocalsocket: get rid of QtScript dependency	2012-10-19 02:43:05 +02:00
tst_qlocalsocket.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00