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
..
access	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-08-26 20:06:57 +02:00
bearer	tests/auto/network: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 04:29:33 +00:00
kernel	QHostAddress: Improve code generation	2015-08-19 06:13:33 +00:00
socket	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-08-26 20:06:57 +02:00
ssl	Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev	2015-08-09 07:06:52 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00