diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-23 12:29:56 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-23 12:29:56 (GMT) |
| commit | b0bc605e2ede4466aabf5b5da040e5801dbf9156 (patch) | |
| tree | 4db2a40ca239bbde9df52580064a9a6c2db921e6 /src/declarative/qml/qmlcompileddata.cpp | |
| parent | 3baf0c6d7d8098c6226c0ffade2b6740b0bc96cc (diff) | |
| download | Qt-b0bc605e2ede4466aabf5b5da040e5801dbf9156.zip Qt-b0bc605e2ede4466aabf5b5da040e5801dbf9156.tar.gz Qt-b0bc605e2ede4466aabf5b5da040e5801dbf9156.tar.bz2 | |
Make more qmlecmascript tests pass
Test cases constantsOverrideBindings, outerBindingOverridesInnerBinding and
aliasPropertyAndBinding now pass.
Diffstat (limited to 'src/declarative/qml/qmlcompileddata.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcompileddata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompileddata.cpp b/src/declarative/qml/qmlcompileddata.cpp index ffb89b3..b2e2d40 100644 --- a/src/declarative/qml/qmlcompileddata.cpp +++ b/src/declarative/qml/qmlcompileddata.cpp @@ -161,7 +161,7 @@ QmlCompiledData::~QmlCompiledData() } } -QObject *QmlCompiledData::TypeReference::createInstance(QmlContext *ctxt) const +QObject *QmlCompiledData::TypeReference::createInstance(QmlContext *ctxt, const QBitField &bindings) const { if (type) { QObject *rv = type->create(); @@ -170,7 +170,7 @@ QObject *QmlCompiledData::TypeReference::createInstance(QmlContext *ctxt) const return rv; } else { Q_ASSERT(component); - return component->create(ctxt); + return QmlComponentPrivate::get(component)->create(ctxt, bindings); } } |