Liang Qi afab1546a7 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: qmake/doc/snippets/code/doc_src_qmake-manual.pro qmake/doc/src/qmake-manual.qdoc src/corelib/io/qstorageinfo_unix.cpp src/corelib/tools/qbytearray.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp tests/auto/network/access/qnetworkreply/BLACKLIST Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c		2015-08-26 20:06:57 +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-08-26 20:06:57 +02:00