From 5603be705e9e99b164bb85014c2abd0edf1d13f3 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 2 May 2019 14:50:31 +0200 Subject: Qt6: remove support for property flags being functions Property flags should be compile time booleans, not something to be determined at runtime. We've been using this to dynamically disable some properties in QWidget based classes dependent on the state of a different property, but this should better get implemented on top of our widgets. Change-Id: I6296e8761303ecdf24d9e842142e8596304c015d Reviewed-by: Simon Hausmann Reviewed-by: Ulf Hermann Reviewed-by: Lars Knoll Reviewed-by: Friedemann Kleint --- .../kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'tests/auto/corelib/kernel') diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index b8212ee6cf..5eb6fe286a 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -1565,16 +1565,6 @@ int TestObject::qt_metacall(QMetaObject::Call _c, int _id, void **_a) _id -= ownPropertyCount; } else if (_c == QMetaObject::ResetProperty) { _id -= ownPropertyCount; - } else if (_c == QMetaObject::QueryPropertyDesignable) { - _id -= ownPropertyCount; - } else if (_c == QMetaObject::QueryPropertyScriptable) { - _id -= ownPropertyCount; - } else if (_c == QMetaObject::QueryPropertyStored) { - _id -= ownPropertyCount; - } else if (_c == QMetaObject::QueryPropertyEditable) { - _id -= ownPropertyCount; - } else if (_c == QMetaObject::QueryPropertyUser) { - _id -= ownPropertyCount; } #endif // QT_NO_PROPERTIES return _id; -- cgit v1.2.3