Fix toJsLiteral(QVariant).

For QVariants of QString type, toJsLiteral(QString) must be called
instead of the simplistic conversion that currently takes place. This
fixes handling of backslashes and double quotes.

Change-Id: I70c1ee4bc2c6b913c6f71fa644671bf33525966f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/lib/corelib/tools/scripttools.cpp b/src/lib/corelib/tools/scripttools.cpp
index 3ebca42a9..64cbaa7d6 100644
--- a/src/lib/corelib/tools/scripttools.cpp
+++ b/src/lib/corelib/tools/scripttools.cpp
@@ -111,7 +111,7 @@ QString toJSLiteral(const QVariant &val)
     if (val.type() == QVariant::Bool)
         return val.toBool() ? QLatin1String("true") : QLatin1String("false");
     if (val.canConvert(QVariant::String))
-        return QLatin1Char('"') + val.toString() + QLatin1Char('"');
+        return toJSLiteral(val.toString());
     return QString::fromLatin1("Unconvertible type %1").arg(QLatin1String(val.typeName()));
 }