Liang Qi 7cbee56296 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/widgets/widgets/qmenu.cpp Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308		2017-06-07 14:02:43 +02:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.9' into dev	2017-06-07 14:02:43 +02:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00