diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-11-22 12:53:33 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-12-04 15:19:09 +0100 |
| commit | 84d950bc32aa63ffa727dd8aa6bf8a65d6154e1f (patch) | |
| tree | 00035aba604c6da66a8fcd91290911a50ca643e8 /src/qml/jsruntime/qv4executablecompilationunit_p.h | |
| parent | f187c3e5c3261d4040e4c742e32d31025409063b (diff) | |
QML: Let IDs in outer context override bound components' properties
This is necessary to make the usage of such IDs actually safe. If we let
local properties override outer IDs, then adding local properties in
later versions invalidates the ID lookups.
[ChangeLog][QtQml][Important Behavior Changes] In QML documents with
bound components, IDs defined in outer contexts override properties
defined in inner contexts now. This is how qmlcachegen has always
interpreted bound components when generating C++ code, and it is
required to make access to outer IDs actually safe. The interpreter and
JIT have previously preferred inner properties over outer IDs.
Pick-to: 6.6 6.5
Fixes: QTBUG-119162
Change-Id: Ic5d3cc3342b4518d3fde1b800efe1b95d8e8b210
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4executablecompilationunit_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4executablecompilationunit_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4executablecompilationunit_p.h b/src/qml/jsruntime/qv4executablecompilationunit_p.h index 5ad3838658..747f776f4a 100644 --- a/src/qml/jsruntime/qv4executablecompilationunit_p.h +++ b/src/qml/jsruntime/qv4executablecompilationunit_p.h @@ -215,6 +215,11 @@ public: return data->flags & CompiledData::Unit::ValueTypesAddressable; } + bool componentsAreBound() const + { + return data->flags & CompiledData::Unit::ComponentsBound; + } + int objectCount() const { return qmlData->nObjects; } const CompiledObject *objectAt(int index) const { |