Liang Qi b7ac036b72 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: src/network/socket/qabstractsocket.cpp src/plugins/platforms/winrt/qwinrtscreen.cpp src/sql/drivers/mysql/qsql_mysql.cpp Change-Id: Ifb73623d09f53340ee5e10283f1f86b580998902		2015-10-13 23:03:51 +02: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
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.5' into 5.6	2015-10-13 23:03:51 +02:00