Liang Qi d51c3ecf8e Merge remote-tracking branch 'origin/5.8' into 5.9 ... Conflicts: examples/network/network.pro mkspecs/features/mac/default_post.prf src/corelib/io/qfilesystemengine_win.cpp src/corelib/io/qprocess.cpp src/corelib/io/qprocess.h src/corelib/io/qprocess_p.h src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/corelib/thread/qmutex.cpp src/platformsupport/fontdatabases/windows/windows.pri src/plugins/platforms/eglfs/eglfsdeviceintegration.pro tests/auto/corelib/io/io.pro Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e		2017-03-13 15:55:44 +01:00
..
bin	Cleaning up the QPainter/arthur testing stuff	2011-06-29 15:10:14 +02:00
shared	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
src	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
.gitignore	Cleaning up the QPainter/arthur testing stuff	2011-06-29 15:10:14 +02:00