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/qv4include.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/qv4include.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 647cc7d2cb..7a5ca8e0ab 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -183,7 +183,7 @@ QV4::Value QV4Include::include(QV4::SimpleCallContext *ctx) if (!context || !context->isJSContext) V4THROW_ERROR("Qt.include(): Can only be called from JavaScript files"); - QUrl url(ctx->engine->resolvedUrl(ctx->arguments[0].toQString())); + QUrl url(ctx->engine->resolvedUrl(ctx->arguments[0].toQStringNoThrow())); QV4::Value callbackFunction = QV4::Value::undefinedValue(); if (ctx->argumentCount >= 2 && ctx->arguments[1].asFunctionObject()) |