diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 05:04:47 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 05:04:47 (GMT) |
| commit | f3254f899fee5fe526127b3b8b76d3b6525a07ca (patch) | |
| tree | e82093e5d0534cb686a95d5fa3262be4a83acf46 /src | |
| parent | dae81570298ea7b87a6a77766636eb4218fca457 (diff) | |
| parent | 14b43ce780b5e9e7cde6aa5cfc456b9768d9f018 (diff) | |
| download | Qt-f3254f899fee5fe526127b3b8b76d3b6525a07ca.zip Qt-f3254f899fee5fe526127b3b8b76d3b6525a07ca.tar.gz Qt-f3254f899fee5fe526127b3b8b76d3b6525a07ca.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/fx/qfxitem.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 0c4d97b..73786a8 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -897,7 +897,16 @@ void QFxItem::qmlLoaded() QmlContext *ctxt = new QmlContext(qmlContext(this)); ctxt->addDefaultObject(this); + if (!d->_qmlcomp->errors().isEmpty()) { + qWarning() << d->_qmlcomp->errors(); + delete d->_qmlcomp; + d->_qmlcomp = 0; + emit qmlChanged(); + return; + } QObject *obj = d->_qmlcomp->create(ctxt); + if (!d->_qmlcomp->errors().isEmpty()) + qWarning() << d->_qmlcomp->errors(); QFxItem *qmlChild = qobject_cast<QFxItem *>(obj); if (qmlChild) { qmlChild->setItemParent(this); |