diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-10-21 17:14:02 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-10-22 11:32:58 +0000 |
| commit | 25e3d888349123c8ad0234345485561a0353ada0 (patch) | |
| tree | dbb0bc63f880ae6ad08cb6ee38d8a293125d82db | |
| parent | f9a064da6aaed0974aa37f923a0b6e37c174ce38 (diff) | |
| download | qt-creator-25e3d888349123c8ad0234345485561a0353ada0.tar.gz | |
JsonWizard: Keep "options" optional
Do not report an error if "options" are unset.
Change-Id: I53f12624275be2d8af8d38da8dfe6bfa6603b948
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
| -rw-r--r-- | src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index f4370132d8..32722aca37 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -626,9 +626,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir, // Options: const QVariant optionValue = data.value(QLatin1String(OPTIONS_KEY)); - const QVariantList optionList = objectOrList(optionValue, errorMessage); - if (optionList.isEmpty()) - return false; + const QVariantList optionList = optionValue.isNull() ? QVariantList() : objectOrList(optionValue, errorMessage); foreach (const QVariant &v, optionList) { if (v.type() != QVariant::Map) { |