diff options
author | Yuya Nishihara <[email protected]> | 2022-02-14 20:52:20 +0900 |
---|---|---|
committer | Yuya Nishihara <[email protected]> | 2022-02-18 11:26:44 +0900 |
commit | dfc16e40ab43e8062b93c566e4316efe4d4f10a0 (patch) | |
tree | e9e81d0ce70f747173f4dd225e01c60c6794bcdb /src/quickcontrols2impl/qquickiconlabel.cpp | |
parent | c013439598900941b860af6f525bcf96232efcc8 (diff) |
QQuickIcon: Resolve source URL relative to outermost property owner
The original attempt, deb238586a "QQuickIcon: Resolve URL relative to
current element," works fine for IconLabel itself, but not for Buttons
containing IconLabel.
// <style>/Button.qml
T.Button {
id: control
icon: // owner: control
contentItem: IconLabel {
icon: control.icon // owner: this, but should be control
}
}
// user code
Button { icon.source: "a.png" }
Since IconLabel is an implementation detail of the Button, IconLabel.icon
owner needs to point to the Button so the user-specified icon.source can
be resolved relative to the user code, not to the <style>/ directory.
This patch fixes the problem by explicitly resolving the source URL on
setIcon() and propagating the resolved icon object to the inner items.
If the relative URL has already been resolved by e.g. Button, the inner
IconLabel never resolves the URL again to itself.
The problem could be addressed by initializing icon owner only once by
Action/Button constructor, but that would lead to dangling owner pointer
as icon object could be copied anywhere. So I've added resolvedSource
data member in place of the owner pointer.
Button { id: dangling }
Button { id: victim; icon: dangling.icon } // owner: dangling
Component.onCompleted: dangling.destroy()
// ... would SEGV (or use after free) if victim.icon.source modified.
Fixes: QTBUG-95587
Pick-to: 6.2 6.3
Change-Id: Ibdd07118e79f1e1f36e1faea0289150eca734e27
Reviewed-by: Mitch Curtis <[email protected]>
Diffstat (limited to 'src/quickcontrols2impl/qquickiconlabel.cpp')
-rw-r--r-- | src/quickcontrols2impl/qquickiconlabel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quickcontrols2impl/qquickiconlabel.cpp b/src/quickcontrols2impl/qquickiconlabel.cpp index a37ce02f6e..309a2c47d4 100644 --- a/src/quickcontrols2impl/qquickiconlabel.cpp +++ b/src/quickcontrols2impl/qquickiconlabel.cpp @@ -404,7 +404,7 @@ void QQuickIconLabel::setIcon(const QQuickIcon &icon) return; d->icon = icon; - d->icon.setOwner(this); + d->icon.ensureRelativeSourceResolved(this); d->updateOrSyncImage(); } |