forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -1539,7 +1539,7 @@ Tasks EnvironmentKitAspectFactory::validate(const Kit *k) const
|
||||
QTC_ASSERT(k, return result);
|
||||
|
||||
const QVariant variant = k->value(EnvironmentKitAspect::id());
|
||||
if (!variant.isNull() && !variant.canConvert(QVariant::List))
|
||||
if (!variant.isNull() && !variant.canConvert(QMetaType::QVariantList))
|
||||
result << BuildSystemTask(Task::Error, Tr::tr("The environment setting value is invalid."));
|
||||
|
||||
return result;
|
||||
@@ -1550,7 +1550,7 @@ void EnvironmentKitAspectFactory::fix(Kit *k)
|
||||
QTC_ASSERT(k, return);
|
||||
|
||||
const QVariant variant = k->value(EnvironmentKitAspect::id());
|
||||
if (!variant.isNull() && !variant.canConvert(QVariant::List)) {
|
||||
if (!variant.isNull() && !variant.canConvert(QMetaType::QVariantList)) {
|
||||
qWarning("Kit \"%s\" has a wrong environment value set.", qPrintable(k->displayName()));
|
||||
EnvironmentKitAspect::setEnvironmentChanges(k, EnvironmentItems());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user