feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix QMetaType::type() related deprecation warnings

Browse Source 
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:
hjk
2024-05-23 09:37:34 +02:00
parent af3ab760ad
commit f30d369b99
62 changed files with 295 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
View File

@@ -114,7 +114,7 @@ WizardPage *FilePageFactory::create(JsonWizard *wizard, Id typeId, const QVarian
bool FilePageFactory::validateData(Id typeId, const QVariant &data, QString *errorMessage)
{
QTC_ASSERT(canCreate(typeId), return false);
if (!data.isNull() && (data.typeId() != QVariant::Map || !data.toMap().isEmpty())) {
if (!data.isNull() && (data.typeId() != QMetaType::QVariantMap || !data.toMap().isEmpty())) {
*errorMessage = Tr::tr("\"data\" for a \"File\" page needs to be unset or an empty object.");
return false;
}
@@ -174,7 +174,7 @@ bool KitsPageFactory::validateData(Id typeId, const QVariant &data, QString *err
{
QTC_ASSERT(canCreate(typeId), return false);
if (data.isNull() || data.typeId() != QVariant::Map) {
if (data.isNull() || data.typeId() != QMetaType::QVariantMap) {
*errorMessage = Tr::tr("\"data\" must be a JSON object for \"Kits\" pages.");
return false;
}
@@ -242,7 +242,7 @@ bool ProjectPageFactory::validateData(Id typeId, const QVariant &data, QString *
Q_UNUSED(errorMessage)
QTC_ASSERT(canCreate(typeId), return false);
if (!data.isNull() && data.typeId() != QVariant::Map) {
if (!data.isNull() && data.typeId() != QMetaType::QVariantMap) {
*errorMessage = Tr::tr("\"data\" must be empty or a JSON object for \"Project\" pages.");
return false;
}
@@ -297,7 +297,7 @@ WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Id typeId, const QVar
bool SummaryPageFactory::validateData(Id typeId, const QVariant &data, QString *errorMessage)
{
QTC_ASSERT(canCreate(typeId), return false);
if (!data.isNull() && (data.typeId() != QVariant::Map)) {
if (!data.isNull() && (data.typeId() != QMetaType::QVariantMap)) {
*errorMessage = Tr::tr("\"data\" for a \"Summary\" page can be unset or needs to be an object.");
return false;
}