Liang Qi 866b47916d Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: Ideea96d1b43d47b1d9b34e11c9986a88e240aa71		2018-04-26 09:55:10 +02:00
..
images	Doc: move notepad example to qtbase and improve it	2017-12-18 13:39:28 +00:00
src	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-26 09:55:10 +02:00
dropsite.qdoc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
mousebuttons.qdoc	Unify license header usage.	2016-03-29 10:20:03 +00:00