From 801e703a796f6f0cc84771d6f156d44fe4c5d526 Mon Sep 17 00:00:00 2001
From: David Skoland <david.skoland@qt.io>
Date: Mon, 2 Nov 2020 13:36:05 +0100
Subject: Standardize metaType stuff in QMetaProperty and QVariant

Change-Id: Idbb03d320039e8ddc4b7a7f42d2ba93ee47c456f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/kernel/qvariant.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/corelib/kernel/qvariant.h')

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;
 
-- 
cgit v1.2.3