diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-05 23:23:43 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-05 23:23:43 (GMT) |
| commit | d018b73c2a79e79f50a988c848f040d263d0e75b (patch) | |
| tree | f87dc897b293ccc653e3fae8202dd7605dd73640 /src/declarative/qml/qmlmetaproperty.cpp | |
| parent | 304238b586b75ee73d46d2de4ffdb0ed40218b70 (diff) | |
| parent | c0525981ffb291fc281a2daaafa290d4ff5917f4 (diff) | |
| download | Qt-d018b73c2a79e79f50a988c848f040d263d0e75b.zip Qt-d018b73c2a79e79f50a988c848f040d263d0e75b.tar.gz Qt-d018b73c2a79e79f50a988c848f040d263d0e75b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlmetaproperty.cpp')
| -rw-r--r-- | src/declarative/qml/qmlmetaproperty.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index afd28bb..350d84b 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -287,6 +287,8 @@ QmlMetaPropertyPrivate::propertyCategory() const int type = propertyType(); if (type == QmlMetaProperty::Invalid) category = QmlMetaProperty::InvalidProperty; + else if (type < QVariant::UserType) + category = QmlMetaProperty::Normal; else if (type == qMetaTypeId<QmlBinding *>()) category = QmlMetaProperty::Bindable; else if (QmlMetaType::isList(type)) |