diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-15 07:42:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-15 07:42:23 (GMT) |
| commit | 981f42a050de75a5f3547006e96a9fca188809b2 (patch) | |
| tree | 4adb2898c72a3d19cb2797dfbabcbe130d25e860 /src/declarative/qml/qdeclarativevme.cpp | |
| parent | 704dd92581783d91ccd234d58896d7078eed14a5 (diff) | |
| parent | 44d30ae2968846bd820b8bb5d1128a8b7a2d4207 (diff) | |
| download | Qt-981f42a050de75a5f3547006e96a9fca188809b2.zip Qt-981f42a050de75a5f3547006e96a9fca188809b2.tar.gz Qt-981f42a050de75a5f3547006e96a9fca188809b2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix crash in compiled bindings
Diffstat (limited to 'src/declarative/qml/qdeclarativevme.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index a23f89d..8cf97d2 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -209,7 +209,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEObjectStack &stack, if (instr.init.contextCache != -1) ctxt->setIdPropertyData(comp->contextCaches.at(instr.init.contextCache)); if (instr.init.compiledBinding != -1) - ctxt->optimizedBindings = new QDeclarativeCompiledBindings(datas.at(instr.init.compiledBinding).constData(), ctxt); + ctxt->optimizedBindings = new QDeclarativeCompiledBindings(datas.at(instr.init.compiledBinding).constData(), ctxt, comp); } break; |