Qt Forward Merge Bot 558fc903ac Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/io/qsettings.cpp src/corelib/kernel/qvariant.cpp src/corelib/serialization/qjsoncbor.cpp src/corelib/serialization/qjsonvalue.cpp src/corelib/tools/tools.pri src/gui/image/qimage.cpp src/gui/kernel/qguivariant.cpp src/widgets/kernel/qshortcut.cpp tests/auto/tools/moc/allmocs_baseline_in.json tests/auto/tools/moc/tst_moc.cpp src/opengl/qglframebufferobject.cpp Done-With: Edward Welbourne <edward.welbourne@qt.io> Done-With: Leander Beernaert <leander.beernaert@qt.io> Change-Id: Ie7f5fa646c607fe70c314bf7195f7578ded1d271		2020-01-28 14:14:20 +00:00
..
codecs	…
io	qdiriterator benchmark: test against std::filesystem	2019-10-21 12:40:49 +02:00
json	…
kernel	Add QObject allocation benchmarks	2019-08-29 14:04:27 +02:00
mimetypes	Use a std::vector instead of a QVector in QMimeDatabasePrivate	2018-09-29 14:22:18 +00:00
plugin	tst_bench_QUuid: eliminate an unused variable	2018-06-14 09:15:06 +00:00
text	QStringList: use local storage in removeDuplicates()	2020-01-26 08:11:58 +00:00
thread	Don't wrap feature detection macros with QT_HAS_FOO() variants	2019-12-10 00:48:07 +01:00
time	Extend QDate's benchmark	2019-08-30 11:22:07 +02:00
tools	Merge remote-tracking branch 'origin/5.15' into dev	2020-01-04 15:32:34 +01:00
corelib.pro	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00