aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest/quicktestresult.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-09 14:33:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-12 21:52:00 +0200
commita723c7ae756ba567c2f818bb77a83c24373d3438 (patch)
tree0508a1c1526e56a7aa3c4a3055c8a4b65a973b06 /src/qmltest/quicktestresult.cpp
parentbf22c55036f6429ccfc849ea71f33e757fae47fa (diff)
Use a ReturnedValue when converting to String or Object
Also rename Value::toQString() to Value::toQStringNoThrow(), and add a throwing toQString() method for JS use. Change-Id: I821b33fc61abb7d08839df965fd337685f61a545 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qmltest/quicktestresult.cpp')
-rw-r--r--src/qmltest/quicktestresult.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index d33687d248..0385389628 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -503,7 +503,7 @@ void QuickTestResult::stringify(QQmlV4Function *args)
result = QLatin1String("Object");
}
} else {
- QString tmp = value.toQString();
+ QString tmp = value.toQStringNoThrow();
if (value.asArrayObject())
result.append(QString::fromLatin1("[%1]").arg(tmp));
else