Liang Qi ee71a9ba81 Merge remote-tracking branch 'origin/5.14' into 5.15 ... Conflicts: src/network/ssl/qsslsocket.cpp src/widgets/kernel/qapplication.cpp Change-Id: Ib7421cc2df59d0969f89b3fbd65a17ea76ffef3b		2019-12-16 07:05:19 +01:00
..
animation	Update for failures only on dev branch. Use general platform names	2019-08-19 18:22:11 +02:00
codecs	Port from QStringViewLiteral to u""	2019-07-29 11:17:28 +03:00
global	Merge remote-tracking branch 'origin/5.14' into 5.15	2019-12-10 13:51:40 +02:00
io	MIME: Make the internal database direct content, not a Qt resource	2019-12-10 15:56:09 -08:00
itemmodels	Merge remote-tracking branch 'origin/5.14' into 5.15	2019-12-16 07:05:19 +01:00
kernel	Merge remote-tracking branch 'origin/5.14' into 5.15	2019-12-12 01:01:04 +01:00
mimetypes	Remove handling of missing Q_COMPILER_RVALUE_REFS	2019-05-01 20:24:45 +00:00
plugin	Avoid initializing QFlags with 0 or nullptr in tests	2019-11-26 09:08:51 +01:00
serialization	Don't wrap feature detection macros with QT_HAS_FOO() variants	2019-12-10 00:48:07 +01:00
statemachine	QStateMachine: Don't scream at the user	2019-10-24 10:26:03 +02:00
text	QByteArray: add a strict mode to fromBase64	2019-12-05 21:04:50 +01:00
thread	Don't wrap feature detection macros with QT_HAS_FOO() variants	2019-12-10 00:48:07 +01:00
time	Merge remote-tracking branch 'origin/5.14' into 5.15	2019-12-12 01:01:04 +01:00
tools	Add QMap::insert(const QMap &map)	2019-12-12 15:25:30 +01:00
corelib.pro	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00