Qt Forward Merge Bot 97417e8f28 Merge remote-tracking branch 'origin/5.14' into 5.15 ... Conflicts: .qmake.conf examples/widgets/widgets/imageviewer/imageviewer.cpp src/corelib/text/qchar.cpp src/corelib/time/qdatetime.cpp Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a		2020-02-04 10:44:00 +01:00
..
chip.cpp	Widgets/GraphicsView examples: cleanup	2019-09-05 17:40:36 +02:00
chip.h	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00
chip.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
fileprint.png	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
images.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
main.cpp	Updated license headers	2016-01-21 18:55:32 +00:00
mainwindow.cpp	Widgets/GraphicsView examples: cleanup	2019-09-05 17:40:36 +02:00
mainwindow.h	Widgets/GraphicsView examples: cleanup	2019-09-05 17:40:36 +02:00
qt4logo.png	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
rotateleft.png	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
rotateright.png	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
view.cpp	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-04 10:44:00 +01:00
view.h	Widgets/GraphicsView examples: cleanup	2019-09-05 17:40:36 +02:00
zoomin.png	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
zoomout.png	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00