diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-27 01:49:20 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-27 01:49:20 (GMT) |
| commit | e22a3c2ba8fae9514b5adcc35e8215caf3812871 (patch) | |
| tree | 56da897d2724f36d512ed48e1c82f0201c2903fc /src/declarative | |
| parent | baedccfc09c3a95a7a900318cf384fd8a03e3eeb (diff) | |
| parent | 809244977033abf2bd934244c9b88b39d8ba1f8a (diff) | |
| download | Qt-e22a3c2ba8fae9514b5adcc35e8215caf3812871.zip Qt-e22a3c2ba8fae9514b5adcc35e8215caf3812871.tar.gz Qt-e22a3c2ba8fae9514b5adcc35e8215caf3812871.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 69ebf9c..60282dc 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -1687,7 +1687,7 @@ bool QmlCompiler::buildGroupedProperty(QmlParser::Property *prop, if (prop->type < (int)QVariant::UserType) { QmlEnginePrivate *ep = static_cast<QmlEnginePrivate *>(QObjectPrivate::get(engine)); - if (ep->valueTypes[prop->type]) { + if (prop->type >= 0 /* QVariant == -1 */ && ep->valueTypes[prop->type]) { COMPILE_CHECK(buildValueTypeProperty(ep->valueTypes[prop->type], prop->value, obj, ctxt.incr())); obj->addValueTypeProperty(prop); |