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	…
chip.h	…
chip.pro	…
fileprint.png	…
images.qrc	…
main.cpp	…
mainwindow.cpp	…
mainwindow.h	…
qt4logo.png	…
rotateleft.png	…
rotateright.png	…
view.cpp	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-04 10:44:00 +01:00
view.h	…
zoomin.png	…
zoomout.png	…