Daniel Vrátil 35e005bc4f Fix metatype trait for types that are both QObject and Q_GADGET ... Fixes ambiguous template instantiation for types that derive from both a QObject and Q_GADGET. For such types we treat them only as QObjects as they extend the functionality of the gadget. Task-number: QTBUG-68803 Change-Id: Ic42766034e14e5df43c4e6f7811e2c0be1dc7e74 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>		2018-06-30 13:23:03 +00: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	Android: fix tst_qlogging	2018-06-28 07:29:30 +00:00
io	Android: Make tst_qfile pass	2018-06-28 07:31:27 +00:00
itemmodels	QSortFilterProxyModel unittest: add test for filtered-out-after-setData	2018-06-28 07:00:00 +00:00
kernel	Fix metatype trait for types that are both QObject and Q_GADGET	2018-06-30 13:23:03 +00:00
mimetypes	QMimeDatabase: fix assert when fetching data for invalid mimetype	2018-04-06 07:19:01 +00:00
plugin	Android: Pass tst_qlibrary	2018-06-29 19:02:09 +00:00
serialization	QJsonDocument: Avoid overflow of string lengths	2018-05-14 10:52:47 +00:00
statemachine	tst_QStateMachine: Don't use unconditional waits	2018-04-04 07:07:40 +00:00
thread	tst_qthreadpool: Skip "stackSize" if unsupported	2018-06-27 17:40:28 +00:00
tools	Android: Pass tst_qlocale	2018-06-28 07:27:22 +00:00
corelib.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00