Fix string -> variant conversion in settings model

When storing the settings in the config-ui tool, the JS value undefined
would erroneously get converted to the string "undefined".

Change-Id: I1579a653bc3162afcdcce52983613ebd01b4c23a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index ba0713a05..a96a98ab8 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -397,21 +397,21 @@ QString settingsValueToRepresentation(const QVariant &value)
     return toJSLiteral(value);
 }
 
-static QVariant variantFromString(const QString &str)
+static QVariant variantFromString(const QString &str, bool &ok)
 {
     // ### use Qt5's JSON reader at some point.
     QScriptEngine engine;
     QScriptValue sv = engine.evaluate(QLatin1String("(function(){return ")
                                       + str + QLatin1String(";})()"));
-    if (sv.isError())
-        return QVariant();
+    ok = !sv.isError();
     return sv.toVariant();
 }
 
 QVariant representationToSettingsValue(const QString &representation)
 {
-    const QVariant variant = variantFromString(representation);
-    if (variant.isValid())
+    bool ok;
+    const QVariant variant = variantFromString(representation, ok);
+    if (ok)
         return variant;
 
     // If it's not valid JavaScript, interpret the value as a string.