diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-15 17:53:16 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-22 18:37:52 +0200 |
| commit | 0a1e4cc7ec7548f6273befff9cdddb0bc7a58961 (patch) | |
| tree | bf8b7ae725ac332fa59bd9058cc479018aca147d /src/quick/items/qquicktextedit.cpp | |
| parent | 4e266103ad8b75d71fb176a2f774faf71997123d (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/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 5494b73784..f5a32b8d88 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1465,7 +1465,9 @@ void QQuickTextEdit::componentComplete() Q_D(QQuickTextEdit); QQuickImplicitSizeItem::componentComplete(); - d->document->setBaseUrl(baseUrl()); + const QUrl url = baseUrl(); + const QQmlContext *context = qmlContext(this); + d->document->setBaseUrl(context ? context->resolvedUrl(url) : url); #if QT_CONFIG(texthtmlparser) if (d->richText) d->control->setHtml(d->text); |