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/jsruntime/qv4variantobject.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/jsruntime/qv4variantobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4variantobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp index 9d7b3c6e9a..ee813b68de 100644 --- a/src/qml/jsruntime/qv4variantobject.cpp +++ b/src/qml/jsruntime/qv4variantobject.cpp @@ -139,7 +139,7 @@ ReturnedValue VariantPrototype::method_toString(const FunctionObject *b, const V RETURN_UNDEFINED(); const QVariant variant = o->d()->data(); QString result = variant.toString(); - if (result.isEmpty() && !variant.canConvert(QMetaType::QString)) { + if (result.isEmpty() && !variant.canConvert(QMetaType(QMetaType::QString))) { QDebug dbg(&result); dbg << variant; // QDebug appends a space, we're not interested in continuing the stream so we chop it off. @@ -167,7 +167,7 @@ ReturnedValue VariantPrototype::method_valueOf(const FunctionObject *b, const Va case QMetaType::Bool: return Encode(v.toBool()); default: - if (QMetaType::typeFlags(v.userType()) & QMetaType::IsEnumeration) + if (QMetaType(v.metaType()).flags() & QMetaType::IsEnumeration) RETURN_RESULT(Encode(v.toInt())); break; } |