summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qvariant.h
diff options
context:
space:
mode:
authorDavid Skoland <david.skoland@qt.io>2020-11-02 13:36:05 +0100
committerDavid Skoland <david.skoland@qt.io>2020-11-03 13:06:14 +0100
commit801e703a796f6f0cc84771d6f156d44fe4c5d526 (patch)
treec0f061888d8f8e6ad560165162e3bf086093422a /src/corelib/kernel/qvariant.h
parent6032a9ca1a69fa074d6d0ffe5ada642770af1d00 (diff)
Standardize metaType stuff in QMetaProperty and QVariant
Change-Id: Idbb03d320039e8ddc4b7a7f42d2ba93ee47c456f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
-rw-r--r--src/corelib/kernel/qvariant.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 4b92da1ad4..810f4aac89 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -242,8 +242,9 @@ class Q_CORE_EXPORT QVariant
inline void swap(QVariant &other) noexcept { qSwap(d, other.d); }
- int typeId() const { return d.typeId(); }
- int userType() const { return d.typeId(); }
+ int userType() const { return typeId(); }
+ int typeId() const { return metaType().id(); }
+
const char *typeName() const;
QMetaType metaType() const;