diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-08 12:33:23 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-16 08:36:58 +0200 |
| commit | 0b92a93e8e165520b12cb8ca1d0a8812ed6e046b (patch) | |
| tree | abd70e7ce9477a31578d85d499ba69052d2befc5 /src/qml/qml/qqmlopenmetaobject.cpp | |
| parent | 7dab889190b2289a7c4b48e732d7cb7838dbf297 (diff) | |
Avoid various warnings about deprected QMetaType methods
Change-Id: I8f4b2703fdd08ff341904219cec33c321e0511c7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlopenmetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlopenmetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlopenmetaobject.cpp b/src/qml/qml/qqmlopenmetaobject.cpp index fe0946c6de..e96e763d89 100644 --- a/src/qml/qml/qqmlopenmetaobject.cpp +++ b/src/qml/qml/qqmlopenmetaobject.cpp @@ -191,7 +191,7 @@ public: bool valueSet = false; QVariant value() const { - if (QMetaType::typeFlags(m_value.userType()) & QMetaType::PointerToQObject + if (m_value.metaType().flags() & QMetaType::PointerToQObject && qobjectTracker.isNull()) return QVariant::fromValue<QObject*>(nullptr); return m_value; @@ -200,7 +200,7 @@ public: void setValue(const QVariant &v) { m_value = v; valueSet = true; - if (QMetaType::typeFlags(v.userType()) & QMetaType::PointerToQObject) + if (v.metaType().flags() & QMetaType::PointerToQObject) qobjectTracker = m_value.value<QObject*>(); } }; |