qt5base-lts/examples/embedded/lightmaps
Qt Forward Merge Bot 75c0ffaf6d Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	examples/network/bearermonitor/CMakeLists.txt
	examples/network/CMakeLists.txt
	src/corelib/tools/qlinkedlist.h
	src/sql/kernel/qsqldriver_p.h
	src/sql/kernel/qsqlresult_p.h
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9
2020-02-26 18:39:21 +01:00
..
CMakeLists.txt Regenerate examples 2020-02-04 18:50:39 +00:00
lightmaps.cpp Be (somewhat more) consistent about the value of pi 2017-06-20 09:53:46 +00:00
lightmaps.h Updated license headers 2016-01-21 18:55:32 +00:00
lightmaps.pro centralize and fixup example sources install targets 2012-11-29 20:21:11 +01:00
main.cpp Updated license headers 2016-01-21 18:55:32 +00:00
mapzoom.cpp Remove usage of bearer management from lightmaps example 2020-02-19 13:28:00 +01:00
mapzoom.h Remove usage of bearer management from lightmaps example 2020-02-19 13:28:00 +01:00
slippymap.cpp QNetworkReply: deprecate the 'error' getter 2020-01-13 15:50:47 +01:00
slippymap.h Updated license headers 2016-01-21 18:55:32 +00:00