qt5base-lts/examples/embedded
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
..
digiflip Regenerate examples 2020-02-04 18:50:39 +00:00
flickable Regenerate examples 2020-02-04 18:50:39 +00:00
flightinfo Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
lightmaps Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
raycasting Regenerate examples 2020-02-04 18:50:39 +00:00
styleexample Regenerate examples 2020-02-04 18:50:39 +00:00
CMakeLists.txt CMake: Add more examples 2019-03-26 13:03:01 +00:00
embedded.pro Examples: Remove remains of wince 2017-07-14 17:30:51 +00:00