qt5base-lts/examples/embedded
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
..
digiflip Updated license headers 2016-01-21 18:55:32 +00:00
flickable Port two examples from QTime to QElapsedTimer 2019-09-27 18:01:58 +02:00
flightinfo Merge remote-tracking branch 'origin/5.14' into 5.15 2020-02-04 10:44:00 +01:00
lightmaps QNetworkReply: deprecate the 'error' getter 2020-01-13 15:50:47 +01:00
raycasting Port two examples from QTime to QElapsedTimer 2019-09-27 18:01:58 +02:00
styleexample Updated license headers 2016-01-21 18:55:32 +00:00
embedded.pro Examples: Remove remains of wince 2017-07-14 17:30:51 +00:00