diff options
| author | Tarja Sundqvist <[email protected]> | 2024-11-22 10:46:11 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2024-11-22 10:46:11 +0200 |
| commit | 64364dbe06b46e5f355c3b2a6684a3eae4f54a7a (patch) | |
| tree | b501b88601bbda604da2adac9307c47b6d3733b2 /src/qml/jsruntime/qv4internalclass_p.h | |
| parent | 6b64e58767c6dd32a29a261e3327fa88b5613621 (diff) | |
| parent | 4d94cd012575956a7633fc19d87059f7a8e0dda2 (diff) | |
Merge tag 'v6.2.11-lts' into tqtc/lts-6.2-opensource
Qt 6.2.11-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I088fe99748b323fbdf49c3766c262eb2a05131d9
Diffstat (limited to 'src/qml/jsruntime/qv4internalclass_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4internalclass_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4internalclass_p.h b/src/qml/jsruntime/qv4internalclass_p.h index 37dbeded6f..a80ec2e957 100644 --- a/src/qml/jsruntime/qv4internalclass_p.h +++ b/src/qml/jsruntime/qv4internalclass_p.h @@ -343,7 +343,7 @@ struct InternalClass : Base { void init(InternalClass *other); void destroy(); - Q_QML_PRIVATE_EXPORT QString keyAt(uint index) const; + Q_QML_PRIVATE_EXPORT ReturnedValue keyAt(uint index) const; Q_REQUIRED_RESULT InternalClass *nonExtensible(); static void addMember(QV4::Object *object, PropertyKey id, PropertyAttributes data, InternalClassEntry *entry); |