Liang Qi 3cb7302480 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/itemviews/qabstractitemview.cpp src/widgets/itemviews/qabstractitemview_p.h Change-Id: I54589b1365103cb1749186af92aab03a49c94b64		2016-08-01 10:03:21 +02:00
..
colorswatch.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-01 10:03:21 +02:00
colorswatch.h	Updated license headers	2016-01-21 18:55:32 +00:00
main.cpp	Updated license headers	2016-01-21 18:55:32 +00:00
mainwindow.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-29 10:10:22 +02:00
mainwindow.h	Updated license headers	2016-01-21 18:55:32 +00:00
mainwindow.pro	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
mainwindow.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
qt.png	Doc: Replaced Trolltech logo with Qt logo	2016-02-03 12:37:37 +00:00
titlebarCenter.png	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
titlebarLeft.png	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
titlebarRight.png	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
toolbar.cpp	Updated license headers	2016-01-21 18:55:32 +00:00
toolbar.h	Updated license headers	2016-01-21 18:55:32 +00:00