Liang Qi d0eaa737e1 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/tools/qstring.h src/gui/image/qimagereader.cpp src/network/access/qnetworkaccessmanager.cpp src/tools/qdoc/doc/examples/examples.qdoc src/widgets/accessible/qaccessiblewidgetfactory_p.h src/widgets/doc/qtwidgets.qdocconf Change-Id: I8fae62283aebefe24e5ca4b4abd97386560c0fcb		2015-10-02 16:59:55 +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-02 16:59:55 +02:00