diff options
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlopenmetaobject.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmltype.cpp | 2 | ||||
| -rw-r--r-- | src/qmlmodels/qqmladaptormodel.cpp | 4 | ||||
| -rw-r--r-- | src/qmlmodels/qqmldelegatemodel.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 7f9696b7b3..0a58ee9652 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -1612,7 +1612,7 @@ QList<QQmlProxyMetaObject::ProxyData> QQmlMetaType::proxyData(const QMetaObject if (t->extraData.cd->extFunc) { QMetaObjectBuilder builder; clone(builder, t->extraData.cd->extMetaObject, t->baseMetaObject, baseMetaObject); - builder.setFlags(QMetaObjectBuilder::DynamicMetaObject); + builder.setFlags(MetaObjectFlag::DynamicMetaObject); QMetaObject *mmo = builder.toMetaObject(); mmo->d.superdata = baseMetaObject; if (!metaObjects.isEmpty()) diff --git a/src/qml/qml/qqmlopenmetaobject.cpp b/src/qml/qml/qqmlopenmetaobject.cpp index e96e763d89..5b0d306c0e 100644 --- a/src/qml/qml/qqmlopenmetaobject.cpp +++ b/src/qml/qml/qqmlopenmetaobject.cpp @@ -166,7 +166,7 @@ void QQmlOpenMetaObjectTypePrivate::init(const QMetaObject *metaObj) if (!mem) { mob.setSuperClass(metaObj); mob.setClassName(metaObj->className()); - mob.setFlags(QMetaObjectBuilder::DynamicMetaObject); + mob.setFlags(MetaObjectFlag::DynamicMetaObject); mem = mob.toMetaObject(); diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp index 2c74d04ffc..a4f7c3f8b5 100644 --- a/src/qml/qml/qqmltype.cpp +++ b/src/qml/qml/qqmltype.cpp @@ -221,7 +221,7 @@ void QQmlTypePrivate::init() const QMetaObjectBuilder builder; QQmlMetaType::clone(builder, extraData.cd->extMetaObject, extraData.cd->extMetaObject, extraData.cd->extMetaObject); - builder.setFlags(QMetaObjectBuilder::DynamicMetaObject); + builder.setFlags(MetaObjectFlag::DynamicMetaObject); QMetaObject *mmo = builder.toMetaObject(); mmo->d.superdata = mo; QQmlProxyMetaObject::ProxyData data = { mmo, extraData.cd->extFunc, 0, 0 }; diff --git a/src/qmlmodels/qqmladaptormodel.cpp b/src/qmlmodels/qqmladaptormodel.cpp index 8c8c37d237..83861d8526 100644 --- a/src/qmlmodels/qqmladaptormodel.cpp +++ b/src/qmlmodels/qqmladaptormodel.cpp @@ -72,7 +72,7 @@ static QV4::ReturnedValue get_index(const QV4::FunctionObject *f, const QV4::Val template <typename T, typename M> static void setModelDataType(QMetaObjectBuilder *builder, M *metaType) { - builder->setFlags(QMetaObjectBuilder::DynamicMetaObject); + builder->setFlags(MetaObjectFlag::DynamicMetaObject); builder->setClassName(T::staticMetaObject.className()); builder->setSuperClass(&T::staticMetaObject); metaType->propertyOffset = T::staticMetaObject.propertyCount(); @@ -770,7 +770,7 @@ public: | QMetaObjectBuilder::SuperClass | QMetaObjectBuilder::ClassName) { - builder.setFlags(QMetaObjectBuilder::DynamicMetaObject); + builder.setFlags(MetaObjectFlag::DynamicMetaObject); } int rowCount(const QQmlAdaptorModel &model) const override diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp index df02be45bb..9e1e635032 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -2061,7 +2061,7 @@ QQmlDelegateModelItemMetaType::~QQmlDelegateModelItemMetaType() void QQmlDelegateModelItemMetaType::initializeMetaObject() { QMetaObjectBuilder builder; - builder.setFlags(QMetaObjectBuilder::DynamicMetaObject); + builder.setFlags(DynamicMetaObject); builder.setClassName(QQmlDelegateModelAttached::staticMetaObject.className()); builder.setSuperClass(&QQmlDelegateModelAttached::staticMetaObject); |