Liang Qi 739585b2f5 Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/corelib/io/qprocess_win.cpp Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9		2018-01-19 09:48:10 +01:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.9' into 5.10	2018-01-19 09:48:10 +01:00
qplatformdefs.h	Merge all "win32-msvc*" mkspecs into one	2016-12-23 13:45:39 +00:00