summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qvariant.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
-rw-r--r--src/corelib/kernel/qvariant.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 75da91b9e5..9018f510a2 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -302,7 +302,7 @@ class Q_CORE_EXPORT QVariant
QT_DEPRECATED_VERSION_X_6_0("Use typeId() or metaType().")
Type type() const
{
- int type = d.typeId();
+ int type = d.type().id();
return type >= QMetaType::User ? UserType : static_cast<Type>(type);
}
QT_DEPRECATED_VERSION_6_0
@@ -469,11 +469,6 @@ public:
{
return QMetaType(typeInterface());
}
-
- inline int typeId() const
- {
- return type().id();
- }
};
public:
static QPartialOrdering compare(const QVariant &lhs, const QVariant &rhs);