From a723c7ae756ba567c2f818bb77a83c24373d3438 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 9 Sep 2013 14:33:28 +0200 Subject: 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 --- src/qml/jsruntime/qv4include.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/jsruntime/qv4include.cpp') 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()) -- cgit v1.2.3