From 639920a27f7d4fcefdfd20c9e103cd16fd048ae6 Mon Sep 17 00:00:00 2001 From: Sami Shalayel Date: Fri, 18 Nov 2022 16:25:55 +0100 Subject: Remove broken assert in QQmlPropertyData::setOverrideIndex The assert leads to strange crashes, as it compares if an overriding and an overridden property share the same m_coreIndex and asserts when equal. This leads to crashes when overriding a function with a property and vice-versa, as those can have an equal m_coreIndex but still is a valid override. Fixes: QTBUG-108627 Change-Id: I67f91d5fdb93603ef95b9a4557fd064edc24721d Reviewed-by: Ulf Hermann (cherry picked from commit d6961c09de36e15c57f29109edf5fbfef53ef4d4) Reviewed-by: Fabian Kosmale --- src/qml/qml/qqmlpropertydata_p.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/qml') diff --git a/src/qml/qml/qqmlpropertydata_p.h b/src/qml/qml/qqmlpropertydata_p.h index abde26f33a..2979a10956 100644 --- a/src/qml/qml/qqmlpropertydata_p.h +++ b/src/qml/qml/qqmlpropertydata_p.h @@ -281,7 +281,6 @@ public: { Q_ASSERT(idx >= std::numeric_limits::min()); Q_ASSERT(idx <= std::numeric_limits::max()); - Q_ASSERT(idx != m_coreIndex); m_overrideIndex = qint16(idx); } -- cgit v1.2.3