JsonWizard: Simplify handling of bools via JS

Change-Id: I5381e83f6714886b7bf8cbcb859e1dd3b115a6c3
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-05-08 17:20:18 +02:00
parent 94dc35694a
commit 8211e6a084
4 changed files with 17 additions and 15 deletions

View File

@@ -155,8 +155,10 @@ QVariant JsonWizard::value(const QString &n) const
bool JsonWizard::boolFromVariant(const QVariant &v, Utils::MacroExpander *expander)
{
if (v.type() == QVariant::String)
return !expander->expand(v.toString()).isEmpty();
if (v.type() == QVariant::String) {
const QString tmp = expander->expand(v.toString());
return !(tmp.isEmpty() || tmp == QLatin1String("false"));
}
return v.toBool();
}