Liang Qi 53b141dceb Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/plugins/platforms/ios/quiview.mm Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf		2017-12-05 13:37:21 +01:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-12-05 13:37:21 +01:00
qplatformdefs.h	Merge all "win32-msvc*" mkspecs into one	2016-12-23 13:45:39 +00:00