diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 19c437a4ec..f2aafba008 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -3160,19 +3160,20 @@ bool QMetaProperty::isAlias() const return (data.flags() & Alias); } +#if QT_DEPRECATED_SINCE(6, 4) /*! \internal + Historically: Executes metacall with QMetaObject::RegisterPropertyMetaType flag. Returns id of registered type or QMetaType::UnknownType if a type could not be registered for any reason. + Obsolete since Qt 6 */ int QMetaProperty::registerPropertyType() const { - int registerResult = -1; - void *argv[] = { ®isterResult }; - mobj->static_metacall(QMetaObject::RegisterPropertyMetaType, data.index(mobj), argv); - return registerResult == -1 ? QMetaType::UnknownType : registerResult; + return typeId(); } +#endif QMetaProperty::QMetaProperty(const QMetaObject *mobj, int index) : mobj(mobj), diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 6fe259868f..228968d37d 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -332,7 +332,10 @@ public: inline const QMetaObject *enclosingMetaObject() const { return mobj; } private: +#if QT_DEPRECATED_SINCE(6, 4) + QT_DEPRECATED_VERSION_X_6_4("obsolete, simply returns typeId()") int registerPropertyType() const; +#endif struct Data { enum { Size = 5 }; diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 3e838818f9..3f97544cf2 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -1040,6 +1040,7 @@ void Generator::generateMetacall() } +// ### Qt 7 (6.x?): remove QMultiMap Generator::automaticPropertyMetaTypesHelper() { QMultiMap automaticPropertyMetaTypes;