diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-12-03 16:46:51 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-12-04 09:03:57 +0100 |
| commit | bf76f4842cca4378a1bbef187f3126de17f62f98 (patch) | |
| tree | b1d902f14719c167d83ec1344b1dc6812265229a /src | |
| parent | 0121d9d2cc6a74d9536b67826a0a33f360cd87b3 (diff) | |
Fix compiler warning from deprecated QVariant APIs
Port to QMetaType.
Pick-to: 6.0
Change-Id: Ie1ff2bda513dbe6ff5050758d0d3998f4e6224ab
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/timeline/keyframedatautils_p.h | 6 | ||||
| -rw-r--r-- | src/imports/timeline/qquickkeyframe.cpp | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/imports/timeline/keyframedatautils_p.h b/src/imports/timeline/keyframedatautils_p.h index 85c815b..fd340c4 100644 --- a/src/imports/timeline/keyframedatautils_p.h +++ b/src/imports/timeline/keyframedatautils_p.h @@ -231,8 +231,8 @@ void writeKeyframesHeader(QCborStreamWriter &writer, QMetaType::Type type, int v // Write QVariant value into CBOR in correct type. void writeValue(QCborStreamWriter &writer, const QVariant &value) { - QMetaType::Type type = static_cast<QMetaType::Type>(value.type()); - switch (type) { + const QMetaType type = value.metaType(); + switch (type.id()) { case QMetaType::Bool: { bool b = value.toBool(); writer.append(b); @@ -299,7 +299,7 @@ void writeValue(QCborStreamWriter &writer, const QVariant &value) break; } default: { - qDebug() << "Not able to add:" << value << "of type:" << type; + qDebug() << "Not able to add:" << value << "of type:" << type.name(); qDebug() << "Please add support for this type into generator."; break; } diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp index 7671c21..db70e66 100644 --- a/src/imports/timeline/qquickkeyframe.cpp +++ b/src/imports/timeline/qquickkeyframe.cpp @@ -517,9 +517,10 @@ QVariant QQuickKeyframe::evaluate(QQuickKeyframe *pre, qreal frametime, int user qreal progress = easing().valueForProgress(offset / duration); - preValue.convert(userType); + const QMetaType targetType(userType); + preValue.convert(targetType); QVariant convertedValue = value(); - convertedValue.convert(userType); + convertedValue.convert(targetType); if (!interpolator) { if (progress < 1.0) |