From 858ac29d6747d9013b9e5aeb056b54c47e980329 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 9 Jul 2025 11:43:56 -0700 Subject: Revert renaming of QArrayData::ref_ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts part of commit 3f61f736266ece40d627dcf6214618a22a009fd1. The renaming of the member caused Qt Creator to break. Since that was a gratuitous change and was backported, it's hard to fix. src/libs/utils/stringtable.cpp:97:44: error: ‘QArrayDataPointer::Data’ {aka ‘struct QTypedArrayData’} has no member named ‘ref_’; did you mean ‘ref’? Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I5d0b1a0c9b42adc38c7bfffd1a86e7abb08d952b Reviewed-by: hjk Reviewed-by: Marc Mutz Reviewed-by: Fabian Kosmale Reviewed-by: Jarek Kobus Reviewed-by: Kai Köhne --- src/corelib/tools/qarraydataops.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/tools/qarraydataops.h') diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index 419585b0260..c20abd12c23 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -82,7 +82,7 @@ public: void destroyAll() noexcept // Call from destructors, ONLY! { Q_ASSERT(this->d); - Q_ASSERT(this->d->m_ref.loadRelaxed() == 0); + Q_ASSERT(this->d->ref_.loadRelaxed() == 0); // As this is to be called only from destructor, it doesn't need to be // exception safe; size not updated. @@ -345,7 +345,7 @@ public: // As this is to be called only from destructor, it doesn't need to be // exception safe; size not updated. - Q_ASSERT(this->d->m_ref.loadRelaxed() == 0); + Q_ASSERT(this->d->ref_.loadRelaxed() == 0); std::destroy(this->begin(), this->end()); } -- cgit v1.2.3