diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-03-19 10:47:29 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-06-02 22:42:15 +0200 |
| commit | fa987d44417528856d5e80ed7b48ba99e19fa307 (patch) | |
| tree | 50cd74c1a9dd3c2197f7de2ac0d431a5b16b0a42 /src/dbus/qdbusmessage.h | |
| parent | 5306fdabc1ceb09875f791526553b3665017f7ce (diff) | |
MetaObject: Store the QMetaType of the methods
This does the analog of 46f407126ef3e94d59254012cdc34d6a4ad2faf2 for the
methods we care about (signals, slots, Q_INVOKABLEs). In addition to the
actual QMetaType, we store an array with offsets so that we later can do
a mapping from methodIndex to metatype.
The newly added QMetaMethod::{return,parameter}MetaType methods can then
be used to retrieve the metatypes.
This does however require that all involved types are complete. This is
unfortunately not a feasible requirement. Thus, we only populate the
metatype array on a best effort basis. For any incomplete type, we store
QMetaType::Unknown. Then, when accessing the metatype, we fall back to
the old string based code base if it's Unknown.
Squashes "moc: support incomplete types" and "Fix compile failures
after QMetaMethod change"
Fixes: QTBUG-82932
Change-Id: I6b7a587cc364b7cad0c158d6de54e8a204289ad4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus/qdbusmessage.h')
| -rw-r--r-- | src/dbus/qdbusmessage.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 33a706abd2..cd8f74d8bc 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -139,6 +139,8 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusMessage) +#else +class Q_DBUS_EXPORT QDBusMessage {}; // dummy class for moc #endif // QT_NO_DBUS #endif |