aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-08-21 11:21:31 +0200
committerLars Knoll <lars.knoll@theqtcompany.com>2015-09-15 07:37:03 +0000
commit5dac83eb2148e4e574b85eaaf1573dee088b2308 (patch)
tree033d9da921ecf6caf3e27f6846359cf5cea21a15 /src/quick
parente6b0f29159d00f3e0273cd890a684e49e8e57751 (diff)
Remove qml context related methods from QQmlV4Function
They were only used in one place, where we can directly call the right method on the ExecutionEngine instead. Change-Id: I02bb16b07ef55ef66bbebb5a572cfbe27bcfcf7f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickloader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index d46e25d255..456eedd0be 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -931,7 +931,7 @@ QUrl QQuickLoaderPrivate::resolveSourceUrl(QQmlV4Function *args)
if (arg.isEmpty())
return QUrl();
- QQmlContextData *context = args->context();
+ QQmlContextData *context = scope.engine->callingQmlContext();
Q_ASSERT(context);
return context->resolvedUrl(QUrl(arg));
}