qt5base-lts/examples/network/fortuneserver
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
fortuneserver.pro clean up example project files, mostly wrt QT+=widgets 2012-12-17 14:08:17 +01:00
main.cpp QtNetwork (examples) - update the fortune server example 2017-09-28 14:07:26 +00:00
server.cpp Remove bearer management from remaining network examples 2020-02-19 13:28:00 +01:00
server.h Remove bearer management from remaining network examples 2020-02-19 13:28:00 +01:00