aboutsummaryrefslogtreecommitdiffstats
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 07:53:44 +0000
commita6aeb9df475a5c76413b408f1e680ad7c3da36a9 (patch)
tree433c9844e22ebfe060371168b65ed5926efb9ca4
parent6afb6ce6b164f437b4e72f0c7c16b4a2c4967299 (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>
-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 83ae5ff9a8..dd9aa21c7b 100644
--- a/src/qml/qml/qqmlpropertydata_p.h
+++ b/src/qml/qml/qqmlpropertydata_p.h
@@ -240,7 +240,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);
}