diff options
| author | Tarja Sundqvist <[email protected]> | 2024-11-08 15:36:12 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2024-11-08 15:36:12 +0200 |
| commit | abe4729ea8db32124c36dc33fc32eb629df03043 (patch) | |
| tree | 6c02a1174b4abbcec9a127758b2c406975661312 /src/qml/jsruntime/qv4identifier.cpp | |
| parent | 7c32569ad27b743b6cb50e2bcb67c9ca1674f238 (diff) | |
| parent | 7550f26e156b3bca5f4b6a9711352c2aa0ba8463 (diff) | |
Merge tag 'v5.15.16-lts' into tqtc/lts-5.15-opensourcev5.15.16-lts-lgpl5.15
Qt 5.15.16-lts release
Change-Id: I2892ad4097deaec565b10357ca61be10048a7c81
Diffstat (limited to 'src/qml/jsruntime/qv4identifier.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4identifier.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4identifier.cpp b/src/qml/jsruntime/qv4identifier.cpp index c3d7165f71..266ed17c18 100644 --- a/src/qml/jsruntime/qv4identifier.cpp +++ b/src/qml/jsruntime/qv4identifier.cpp @@ -152,7 +152,7 @@ const IdentifierHashEntry *IdentifierHash::lookup(const QString &str) const if (!d) return nullptr; - PropertyKey id = d->identifierTable->asPropertyKey(str); + PropertyKey id = d->identifierTable->asPropertyKey(str, IdentifierTable::ForceConversionToId); return lookup(id); } @@ -169,7 +169,7 @@ const IdentifierHashEntry *IdentifierHash::lookup(String *str) const const PropertyKey IdentifierHash::toIdentifier(const QString &str) const { Q_ASSERT(d); - return d->identifierTable->asPropertyKey(str); + return d->identifierTable->asPropertyKey(str, IdentifierTable::ForceConversionToId); } const PropertyKey IdentifierHash::toIdentifier(Heap::String *str) const |