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
..
aircraft.png	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
flightinfo.cpp	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-04 10:44:00 +01:00
flightinfo.pro	centralize and fixup example sources install targets	2012-11-29 20:21:11 +01:00
flightinfo.qrc	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
form.ui	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00