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
qfuture.pro	Drop unnecessary dependencies from some tests	2017-01-10 16:34:52 +00:00
tst_qfuture.cpp	Merge remote-tracking branch 'origin/5.9' into dev	2017-03-20 09:00:44 +01:00