From 040a0f2d30ca62ec08bff022d27a33103554d593 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Wed, 24 Jun 2015 16:14:45 +0200
Subject: [PATCH] JsonWizard: Allow for variables in features passed to
 KitsPage

Change-Id: I8c0d6b8b6e46d2de7cd4b088c7c98c2efe57427f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
 src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp | 6 +++---
 src/plugins/projectexplorer/jsonwizard/jsonkitspage.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
index c8ec2532b89..af2641351c2 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
@@ -145,7 +145,7 @@ FeatureSet JsonKitsPage::evaluate(const QVector<JsonKitsPage::ConditionalFeature
     FeatureSet features;
     foreach (const ConditionalFeature &f, list) {
         if (JsonWizard::boolFromVariant(f.condition, wiz->expander()))
-            features |= f.feature;
+            features |= Feature::fromString(wiz->expander()->expand(f.feature));
     }
     return features;
 }
@@ -167,7 +167,7 @@ QVector<JsonKitsPage::ConditionalFeature> JsonKitsPage::parseFeatures(const QVar
 
     foreach (const QVariant &element, data.toList()) {
         if (element.type() == QVariant::String) {
-            result.append({ Feature::fromString(element.toString()), QVariant(true) });
+            result.append({ element.toString(), QVariant(true) });
         } else if (element.type() == QVariant::Map) {
             const QVariantMap obj = element.toMap();
             const QString feature = obj.value(QLatin1String(KEY_FEATURE)).toString();
@@ -177,7 +177,7 @@ QVector<JsonKitsPage::ConditionalFeature> JsonKitsPage::parseFeatures(const QVar
                 return QVector<ConditionalFeature>();
             }
 
-            result.append({ Feature::fromString(feature), obj.value(QLatin1String(KEY_CONDITION), true) });
+            result.append({ feature, obj.value(QLatin1String(KEY_CONDITION), true) });
         } else {
             if (errorMessage)
                 *errorMessage = tr("Feature list element is not a string or object.");
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
index 1f21b80aedf..ac9dd50a221 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
@@ -58,10 +58,10 @@ public:
     class ConditionalFeature {
     public:
         ConditionalFeature() = default;
-        ConditionalFeature(const Core::Feature &f, const QVariant &c) : feature(f), condition(c)
+        ConditionalFeature(const QString &f, const QVariant &c) : feature(f), condition(c)
         { }
 
-        Core::Feature feature;
+        QString feature;
         QVariant condition;
     };
     static QVector<ConditionalFeature> parseFeatures(const QVariant &data,