Liang Qi 106d3b9bf9 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoamenu.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/widgets/styles/qstylehelper_p.h Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb		2017-08-15 16:31:48 +02:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-15 16:31:48 +02:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00