aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickborderimage.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-06-15 17:53:16 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-06-22 18:37:52 +0200
commit0a1e4cc7ec7548f6273befff9cdddb0bc7a58961 (patch)
treebf8b7ae725ac332fa59bd9058cc479018aca147d /src/quick/items/qquickborderimage.cpp
parent4e266103ad8b75d71fb176a2f774faf71997123d (diff)
Do not resolve URLs when assigning them to a property
We don't know in advance if a URL is part of the source code and should be relative to the current element, or if it is part of the application data and should not be touched. [ChangeLog][QtQml][Important Behavior Changes] URLs are not resolved or intercepted anymore when assigning them to a "url" property. Instead they are resolved and possibly intercepted when used to access an actual resource. Fixes: QTBUG-76879 Change-Id: Iaa2385aff2c13aa71a12e57385d9afb5dc60a073 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items/qquickborderimage.cpp')
-rw-r--r--src/quick/items/qquickborderimage.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index 3679df37d1..b8828d23ba 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -299,7 +299,9 @@ void QQuickBorderImage::load()
loadEmptyUrl();
} else {
if (d->url.path().endsWith(QLatin1String("sci"))) {
- QString lf = QQmlFile::urlToLocalFileOrQrc(d->url);
+ const QQmlContext *context = qmlContext(this);
+ QString lf = QQmlFile::urlToLocalFileOrQrc(context ? context->resolvedUrl(d->url)
+ : d->url);
if (!lf.isEmpty()) {
QFile file(lf);
file.open(QIODevice::ReadOnly);