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
..
access	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-26 18:39:21 +01:00
bearer	Merge remote-tracking branch 'origin/5.15' into dev	2019-12-09 10:16:01 +01:00
doc	QNAM Doc: Remove mention of bearer	2020-02-19 13:28:01 +01:00
kernel	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-26 18:39:21 +01:00
socket	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-26 18:39:21 +01:00
ssl	QSslConfiguration - fix a warning	2020-02-14 07:58:32 +01:00
.prev_CMakeLists.txt	CMake: Allow building bundled 3rd party libraries in qtbase	2020-02-25 15:43:16 +01:00
CMakeLists.txt	CMake: Allow building bundled 3rd party libraries in qtbase	2020-02-25 15:43:16 +01:00
configure.cmake	Remove QUrl::topLevelDomain	2020-02-20 21:41:54 +01:00
configure.json	Remove QUrl::topLevelDomain	2020-02-20 21:41:54 +01:00
configure.pri	configure: actually resolve libraries into full filepaths	2018-12-03 11:25:56 +00:00
network.pro	Fix build with -no-feature-bearermanagement	2020-02-15 16:09:42 +01:00