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
..
clientserver	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
udpServer	Update copyright headers	2015-02-11 06:49:51 +00:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	tst_qudpsocket::multicast - blacklist several combinations	2015-10-30 22:01:50 +00:00
qudpsocket.pro	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
tst_qudpsocket.cpp	tests/auto/network: Remove some placeholder formatting.	2015-10-19 12:38:28 +00:00