QML: Change the property data flags into a bit field

This will make it easier in follow-up patches to add or remove flags. It
also shrinks the flags, because each type doesn't need its own bit (as
those are mutually exclusive).

Change-Id: I5ba6de5f330eb20c82aa16b4467ed6c952725979
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index 260cf9deaa..33f3b96389 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -301,13 +301,12 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name)
 
             QMetaProperty vtProp = valueTypeMetaObject->property(idx);
 
-            Q_ASSERT(QQmlPropertyData::flagsForProperty(vtProp) <= QQmlPropertyData::ValueTypeFlagMask);
             Q_ASSERT(vtProp.userType() <= 0x0000FFFF);
             Q_ASSERT(idx <= 0x0000FFFF);
 
             object = currentObject;
             core = *property;
-            core.setFlags(core.getFlags() | QQmlPropertyData::IsValueTypeVirtual);
+            core.setAsValueTypeVirtual();
             core.valueTypeFlags = QQmlPropertyData::flagsForProperty(vtProp);
             core.valueTypePropType = vtProp.userType();
             core.valueTypeCoreIndex = idx;
@@ -1169,7 +1168,7 @@ QQmlPropertyPrivate::writeValueProperty(QObject *object,
         writeBack->read(object, core.coreIndex);
 
         QQmlPropertyData data = core;
-        data.setFlags(QQmlPropertyData::Flag(core.valueTypeFlags));
+        data.setFlags(core.valueTypeFlags);
         data.coreIndex = core.valueTypeCoreIndex;
         data.propType = core.valueTypePropType;
 
@@ -1634,7 +1633,7 @@ QQmlPropertyPrivate::saveValueType(const QQmlPropertyData &base,
     QMetaProperty subProp = subObject->property(subIndex);
 
     QQmlPropertyData core = base;
-    core.setFlags(core.getFlags() | QQmlPropertyData::IsValueTypeVirtual);
+    core.setAsValueTypeVirtual();
     core.valueTypeFlags = QQmlPropertyData::flagsForProperty(subProp);
     core.valueTypeCoreIndex = subIndex;
     core.valueTypePropType = subProp.userType();