qt5base-lts/tests/auto/corelib/io/qfilesystemwatcher
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
BLACKLIST tst_qfilesystemwatcher: Blacklist flaky tests on Windows. 2015-11-17 14:27:23 +00:00
qfilesystemwatcher.pro Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
tst_qfilesystemwatcher.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-04-05 14:22:45 +02:00