diff options
author | hjk <hjk@qt.io> | 2024-05-23 09:37:34 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2024-05-23 13:04:22 +0000 |
commit | f30d369b99831bc7934c00c9c6ecbcb9680e1cee (patch) | |
tree | 7901dd6753115d735565c829b067dfd36fbe478c /src/plugins/qbsprojectmanager | |
parent | af3ab760ad4cfc81c264291db1dda5e0da037599 (diff) |
Fix QMetaType::type() related deprecation warnings
Not in sdktool, which still builds with Qt 5.15
Change-Id: I6e6f4331127b821e471e2840e7959cd65e6419e9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qbsprojectmanager')
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsprofilemanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp index 3cfd68d5ce9..01dd5efb4fe 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp @@ -60,7 +60,7 @@ QString toJSLiteral(const QVariant &val) { if (!val.isValid()) return QString("undefined"); - if (val.typeId() == QVariant::List || val.typeId() == QVariant::StringList) { + if (val.typeId() == QMetaType::QVariantList || val.typeId() == QMetaType::QStringList) { QString res; const auto list = val.toList(); for (const QVariant &child : list) { @@ -71,7 +71,7 @@ QString toJSLiteral(const QVariant &val) res.append(']'); return res; } - if (val.typeId() == QVariant::Map) { + if (val.typeId() == QMetaType::QVariantMap) { const QVariantMap &vm = val.toMap(); QString str("{"); for (auto it = vm.begin(); it != vm.end(); ++it) { @@ -84,7 +84,7 @@ QString toJSLiteral(const QVariant &val) } if (val.typeId() == QVariant::Bool) return toJSLiteral(val.toBool()); - if (val.canConvert(QVariant::String)) + if (val.canConvert(QMetaType::QString)) return toJSLiteral(val.toString()); return QString::fromLatin1("Unconvertible type %1").arg(QLatin1String(val.typeName())); } |