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/qml/qml/qqmlproperty_p.h | |
| 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/qml/qml/qqmlproperty_p.h')
| -rw-r--r-- | src/qml/qml/qqmlproperty_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlproperty_p.h b/src/qml/qml/qqmlproperty_p.h index 5e357d77c0..f8315854f7 100644 --- a/src/qml/qml/qqmlproperty_p.h +++ b/src/qml/qml/qqmlproperty_p.h @@ -150,8 +150,7 @@ public: int type = 0, int *types = nullptr); static void flushSignal(const QObject *sender, int signal_index); - static QVariant resolvedUrlSequence( - const QVariant &value, const QQmlRefPointer<QQmlContextData> &context); + static QVariant urlSequence(const QVariant &value); static QQmlProperty create( QObject *target, const QString &propertyName, const QQmlRefPointer<QQmlContextData> &context); |