Liang Qi ae2695535a Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/io/qfilesystemengine_win.cpp src/gui/text/qdistancefield.cpp src/plugins/platforms/xcb/qxcbconnection.h Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e		2017-03-20 09:00:44 +01:00
..
.gitignore	…
BLACKLIST	Blacklist also tst_QSemaphore::tryAcquireWithTimeout(2s)	2017-03-17 20:19:20 +00:00
qsemaphore.pro	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +00:00
tst_qsemaphore.cpp	Merge remote-tracking branch 'origin/5.9' into dev	2017-02-17 20:10:34 +01:00