Liang Qi b894a8def5 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: mkspecs/features/qml_module.prf mkspecs/features/qt_common.prf src/gui/text/qzip.cpp src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/windows/array.h src/testlib/qtestcase.cpp src/widgets/dialogs/qfilesystemmodel.h Change-Id: Ie41c5868415b81f7693c80e045497035504bb210		2016-04-29 17:55:20 +02:00
..
images	Clean up diagramscene example's toolbutton icons.	2012-11-21 16:36:50 +01:00
arrow.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
arrow.h	Unify license header usage.	2016-03-29 10:20:03 +00:00
diagramitem.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
diagramitem.h	Unify license header usage.	2016-03-29 10:20:03 +00:00
diagramscene.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
diagramscene.h	Unify license header usage.	2016-03-29 10:20:03 +00:00
diagramscene.pro	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02:00
diagramscene.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
diagramtextitem.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
diagramtextitem.h	Unify license header usage.	2016-03-29 10:20:03 +00:00
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
mainwindow.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
mainwindow.h	Unify license header usage.	2016-03-29 10:20:03 +00:00