Liang Qi 60fefff22f Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: examples/widgets/graphicsview/elasticnodes/graphwidget.cpp examples/widgets/graphicsview/elasticnodes/node.cpp examples/widgets/graphicsview/elasticnodes/node.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_drawing.mm src/widgets/kernel/qmacgesturerecognizer_p.h Change-Id: I13cf06bac75d48d779d8ee7b5c91bfc976f2a32c		2018-05-03 14:50:22 +02:00
..
colorswatch.cpp	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
colorswatch.h	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
main.cpp	Make the Main Window example use high-DPI toolbar icons	2017-12-19 17:57:08 +00:00
mainwindow.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-03 14:50:22 +02:00
mainwindow.h	Examples: Fix unused variable warnings by Clang	2018-05-02 13:05:55 +00:00
mainwindow.pro	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00: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	Make the Main Window example use high-DPI toolbar icons	2017-12-19 17:57:08 +00:00
toolbar.h	Updated license headers	2016-01-21 18:55:32 +00:00