Liang Qi 65a97fccc6 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9		2018-01-20 22:36:19 +01:00
..
charactermap.pro	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00:00
characterwidget.cpp	Update usage of QFontMetrics::width() to new API	2017-12-08 15:06:32 +00:00
characterwidget.h	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-09 17:59:51 +02:00
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
mainwindow.cpp	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
mainwindow.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-05 08:58:48 +02:00