diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-08-27 13:56:48 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2025-09-01 19:25:21 +0200 |
| commit | 2ce3b7bf0a2ee94593273ae897dd91e3cef21eba (patch) | |
| tree | 248c92ceb4a3c21d3df740dbe92040fbf1611e3d /src/qml/jsruntime/qv4sequenceobject.cpp | |
| parent | 476ee7f5a3b1c4ac027f8dbba35e864158c57d17 (diff) | |
QtQml: Eliminate Heap::Sequence::hasData()
We want to encapsulate the container as much as possible.
Pick-to: 6.10 6.9 6.8
Task-number: QTBUG-129972
Task-number: QTBUG-139025
Change-Id: I7cf991ea7a3a879584066e7121c49e102ebadf08
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4sequenceobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index 494f1a3196..4cb620d496 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -646,10 +646,11 @@ QVariant SequencePrototype::toVariant(const Sequence *object) // outdated data. This is the behavior sequences have always shown. if (p->isReference()) p->loadReference(); - if (!p->hasData()) - return QVariant(); - return QVariant(p->listType(), p->storagePointer()); + if (const void *storage = p->m_container) + return QVariant(p->listType(), storage); + + return QVariant(); } bool convertToIterable(QMetaType metaType, void *data, QV4::Object *sequence) |