diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-28 05:05:53 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-28 05:05:53 (GMT) |
| commit | 2b8abf28d10a6d064fe116892161289be5ffb391 (patch) | |
| tree | 6a1123766682c82bddbdf358316f26e11f6976c7 /src/declarative/qml/qmlcompiler.cpp | |
| parent | d7ffaa8ccbf881d25004b9a710259701d1a8c9bc (diff) | |
| parent | a6ffd7c7c28066f2794579bc40e7b9517e76d1ff (diff) | |
| download | Qt-2b8abf28d10a6d064fe116892161289be5ffb391.zip Qt-2b8abf28d10a6d064fe116892161289be5ffb391.tar.gz Qt-2b8abf28d10a6d064fe116892161289be5ffb391.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of ../kinetic into kinetic-declarativeui-qfx
Conflicts:
examples/declarative/mouseregion/mouse.qml
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 7d9dd5f..d55647c 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -911,8 +911,10 @@ bool QmlCompiler::compileAttachedProperty(QmlParser::Property *prop, QmlInstruction fetch; fetch.type = QmlInstruction::FetchAttached; fetch.line = prop->line; - int ref = output->indexForByteArray(prop->name); - fetch.fetchAttached.idx = ref; + int id = QmlMetaType::attachedPropertiesFuncId(prop->name); + if(id == -1) + COMPILE_EXCEPTION("Non-existant attached property object" << prop->name); + fetch.fetchAttached.id = id; output->bytecode << fetch; COMPILE_CHECK(compileFetchedObject(prop->value, ctxt + 1)); |