aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
diff options
context:
space:
mode:
authorSami Shalayel <sami.shalayel@qt.io>2022-11-18 16:25:55 +0100
committerSami Shalayel <sami.shalayel@qt.io>2022-11-22 08:53:19 +0100
commit639920a27f7d4fcefdfd20c9e103cd16fd048ae6 (patch)
tree71c93c5dbea9d2ea5e4e68c59de4e7766271798a /src/qml
parent68469a07647e88a5ccc20339e0409fb818e2bbf1 (diff)
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 <ulf.hermann@qt.io> (cherry picked from commit d6961c09de36e15c57f29109edf5fbfef53ef4d4) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml')
-rw-r--r--src/qml/qml/qqmlpropertydata_p.h1
1 files changed, 0 insertions, 1 deletions
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<qint16>::min());
Q_ASSERT(idx <= std::numeric_limits<qint16>::max());
- Q_ASSERT(idx != m_coreIndex);
m_overrideIndex = qint16(idx);
}