Liang Qi 7e1b504f31 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: mkspecs/features/qt_module_headers.prf tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qwidget/BLACKLIST Change-Id: I2a08952d28d1d0e3d73f521a3d44700ce79ff16c		2018-05-14 14:51:46 +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-05-14 14:51:46 +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