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
..
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
CMakeLists.txt	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qfont.pro	Handle fonts that have commas/quotes in the family name	2018-11-08 16:08:25 +00:00
testfont.qrc	Handle fonts that have commas/quotes in the family name	2018-11-08 16:08:25 +00:00
tst_qfont.cpp	Fix font and palette propagation for themed children created at runtime	2020-02-20 08:04:47 +01:00
weirdfont.otf	Handle fonts that have commas/quotes in the family name	2018-11-08 16:08:25 +00:00