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
..
3rdparty	[Backport] Remove usage of auto_ptr in MacroExpander	2018-06-21 13:13:04 +00:00
android	Add translation for unsupported_android_version for fr and de	2018-05-25 06:50:40 +00:00
angle	[Backport] Remove usage of auto_ptr in MacroExpander	2018-06-21 13:13:04 +00:00
concurrent	Doc: Add missing full stops in briefs	2018-06-21 14:23:30 +00:00
corelib	Fix metatype trait for types that are both QObject and Q_GADGET	2018-06-30 13:23:03 +00:00
dbus	Doc: Add references to QDBusAbstractAdaptor implementation example	2018-06-29 05:16:04 +00:00
gui	Fix: bad-looking scaled rendering of painterpath in OpenGL paint engine	2018-06-28 14:28:53 +00:00
network	QtCore/QtNetwork/QTestlib: Fix build with MinGW/g++ 8.1 x64	2018-06-25 14:56:19 +00:00
opengl	Merge remote-tracking branch 'origin/5.10' into 5.11	2018-02-15 10:14:11 +01:00
openglextensions	Replace Q_DECL_FINAL with final	2017-09-22 07:30:01 +00:00
platformheaders	Doc: Add missing full stops in briefs	2018-06-21 14:23:30 +00:00
platformsupport	Fix mouse-wheel handling for evdev devices with extended values	2018-06-22 11:14:53 +00:00
plugins	Fix automatic showing/hiding of the Windows 10 on-screen keyboard	2018-06-28 09:28:57 +00:00
printsupport	QWin32PrintEngine: Fix crash in drawPixmap(), drawImage()	2018-05-23 08:26:57 +00:00
sql	doc: Explicitly mention that QSqlRecord fields are generated by default	2018-05-23 07:01:39 +00:00
testlib	QAbstractItemModelTester: don't call match(QModelIndex(), ...)	2018-06-27 10:12:01 +00:00
tools	Move androiddeployqt to qtbase	2018-06-21 11:08:57 +00:00
widgets	QMenuBar: Account for displays that are above 0x0	2018-06-29 05:37:13 +00:00
winmain	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
xml	QDomNode::replaceChild(): Fix documentation typo	2018-03-16 06:34:13 +00:00
src.pro	Move androiddeployqt to qtbase	2018-06-21 11:08:57 +00:00