Liang Qi f285687584 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: examples/corelib/ipc/ipc.pro src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf		2016-04-05 14:22:45 +02:00
..
.gitignore	Moving relevant tests to corelib/io	2011-08-31 10:08:38 +02:00
android_testdata.qrc	Android: Fix QIODevice tests	2014-12-22 09:27:44 +01:00
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qiodevice.pro	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
tst_qiodevice.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00