diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-10 13:50:03 +1000 |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-10 13:50:03 +1000 |
commit | dc2b89dcb0022f9352932cf09ae716b4ac0dc043 (patch) | |
tree | c6f1e352938294e5ff202abb92e3299e74475ec0 /src/declarative/qml/qdeclarativecompiler.cpp | |
parent | db09dd7c820fb612658a08a1617758db277c5b55 (diff) | |
parent | 77dfbea79094be6b763319fcca03f6b48ab8248e (diff) |
Merge branch 'qtquick2' into v8
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 712f787549..e4ad463dad 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -649,6 +649,7 @@ bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine, out->dumpInstructions(); if (compilerStatDump()) dumpStats(); + Q_ASSERT(out->rootPropertyCache); } else { reset(out); } @@ -1229,6 +1230,11 @@ void QDeclarativeCompiler::genComponent(QDeclarativeParser::Object *obj) id.setId.index = obj->idIndex; output->addInstruction(id); } + + if (obj == unitRoot) { + output->rootPropertyCache = output->types[obj->type].createPropertyCache(engine); + output->rootPropertyCache->addref(); + } } bool QDeclarativeCompiler::buildComponent(QDeclarativeParser::Object *obj, |