aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvmemetaobject_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject_p.h')
-rw-r--r--src/qml/qml/qqmlvmemetaobject_p.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h
index 5751989b0c..4216e09733 100644
--- a/src/qml/qml/qqmlvmemetaobject_p.h
+++ b/src/qml/qml/qqmlvmemetaobject_p.h
@@ -90,6 +90,7 @@ struct QQmlVMEMetaData
struct AliasData {
int contextIdx;
int propertyIdx;
+ int propType;
int flags;
int notifySignal;
@@ -97,19 +98,19 @@ struct QQmlVMEMetaData
return propertyIdx == -1;
}
bool isPropertyAlias() const {
- return !isObjectAlias() && !(propertyIdx & 0xFF000000);
+ return !isObjectAlias() && !(propertyIdx & 0xFFFF0000);
}
bool isValueTypeAlias() const {
- return !isObjectAlias() && (propertyIdx & 0xFF000000);
+ return !isObjectAlias() && (propertyIdx & 0xFFFF0000);
}
int propertyIndex() const {
return propertyIdx & 0x0000FFFF;
}
int valueTypeIndex() const {
- return (propertyIdx & 0x00FF0000) >> 16;
+ return (propertyIdx & 0xFFFF0000) >> 16;
}
int valueType() const {
- return ((unsigned int)propertyIdx) >> 24;
+ return (propertyIdx & 0xFFFF0000) ? propType : 0;
}
};