From a064280ca3a5af349cbdd89719c76d7a9e36e20b Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 2 Mar 2015 16:18:27 +0100 Subject: [PATCH] JsonWizard: Allow for better compatibility with QtC 3.3 project wizards Support for a description was added in 3.4. Keep wizards without that working. Change-Id: I13b4506ea154018cac6f337196846a881439628d Reviewed-by: Tobias Hunger --- .../projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp index 19297939e8b..bca42a7f527 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp @@ -181,7 +181,7 @@ Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeI JsonProjectPage *page = new JsonProjectPage; - QVariantMap tmp = data.toMap(); + QVariantMap tmp = data.isNull() ? QVariantMap() : data.toMap(); QString description = tmp.value(QLatin1String("trDescription")).toString(); page->setDescription(description); @@ -193,12 +193,11 @@ bool ProjectPageFactory::validateData(Core::Id typeId, const QVariant &data, QSt Q_UNUSED(errorMessage); QTC_ASSERT(canCreate(typeId), return false); - if (data.isNull() || data.type() != QVariant::Map) { + if (!data.isNull() && data.type() != QVariant::Map) { *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizard", - "\"data\" must be a JSON object for \"Project\" pages."); + "\"data\" must be empty or a JSON object for \"Project\" pages."); return false; } - return true; }