diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-09 14:33:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 21:52:00 +0200 |
| commit | a723c7ae756ba567c2f818bb77a83c24373d3438 (patch) | |
| tree | 0508a1c1526e56a7aa3c4a3055c8a4b65a973b06 /src/qml/jsruntime/qv4numberobject.cpp | |
| parent | bf22c55036f6429ccfc849ea71f33e757fae47fa (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/qml/jsruntime/qv4numberobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4numberobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp index ffcbca2ce5..fe60be7075 100644 --- a/src/qml/jsruntime/qv4numberobject.cpp +++ b/src/qml/jsruntime/qv4numberobject.cpp @@ -196,7 +196,7 @@ Value NumberPrototype::method_toFixed(SimpleCallContext *ctx) else if (v < 1.e21) str = QString::number(v, 'f', int (fdigits)); else - return __qmljs_string_from_number(ctx, v); + return __qmljs_string_from_number(ctx, v).get(); return Value::fromString(ctx, str); } @@ -231,7 +231,7 @@ Value NumberPrototype::method_toPrecision(SimpleCallContext *ctx) Value prec = ctx->argument(0); if (prec.isUndefined()) - return __qmljs_to_string(v, ctx); + return __qmljs_to_string(v, ctx).get(); double precision = prec.toInt32(); if (precision < 1 || precision > 21) { |