Liang Qi b5a956601f Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro Change-Id: I3169f709cc2a1b75007cb23c02c4c79b74feeb04		2018-05-08 20:43:45 +02:00
..
animation	qtbase: cleanup BLACKLIST files	2018-02-13 15:20:33 +00:00
codecs	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
global	Declare the operator| in the Qt namespace for QFlags in that namespaces	2018-04-08 14:24:27 +00:00
io	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-08 20:43:45 +02:00
itemmodels	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-02 13:15:15 +02:00
kernel	QObject: Extend debug output of connect	2018-04-18 17:57:30 +00:00
mimetypes	QMimeDatabase: fix assert when fetching data for invalid mimetype	2018-04-06 07:19:01 +00:00
plugin	tst_QLibrary: Ensure installation order of testdata libs	2018-03-02 07:20:04 +00:00
serialization	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-05 01:00:55 +02:00
statemachine	tst_QStateMachine: Don't use unconditional waits	2018-04-04 07:07:40 +00:00
thread	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-26 09:55:10 +02:00
tools	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-03 14:50:22 +02:00
corelib.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00