diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-25 20:56:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-25 20:56:51 +0200 |
| commit | f9ef039ad955db67dc3ab6e9056afc4a325aa9a3 (patch) | |
| tree | 4928ff85fb630639e306ea4eb7137a2064a80c8b /src/quick/items/qquickloader.cpp | |
| parent | 0238c739f81911f0963cf2c40b27dcfc8e3d38b7 (diff) | |
| parent | 52fb4685e95e5b44e54d2d0f8ea27dea866c75e9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/qml/debugger/qqmldebug.cpp
Change-Id: I93de5a81b18cdece475870cf7cfba1b9baef2304
Diffstat (limited to 'src/quick/items/qquickloader.cpp')
| -rw-r--r-- | src/quick/items/qquickloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 466f4698cb..0040843929 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -949,7 +949,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)); } |