Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 17 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 1e3a082..bd2d1d0 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -55,6 +55,7 @@
 #include "qmlbinding.h"
 #include <QtCore/qdebug.h>
 #include <QApplication>
+#include <private/qmlbinding_p.h>
 
 #include "qmlscriptparser_p.h"
 
@@ -197,6 +198,12 @@ QmlComponent::QmlComponent(QObject *parent)
 QmlComponent::~QmlComponent()
 {
     Q_D(QmlComponent);
+
+    if (d->completePending) {
+        qWarning("QmlComponent: Component destroyed while completion pending");
+        d->completeCreate();
+    }
+
     if (d->typeData) {
         d->typeData->remWaiter(d);
         d->typeData->release();
@@ -585,8 +592,10 @@ QmlComponentPrivate::beginCreate(QmlContext *context, const QBitField &bindings)
         ep->bindValues.clear();
         ep->parserStatus.clear();
         completePending = true;
+        QmlEnginePrivate::get(engine)->inProgressCreations++;
     }
 
+
     if (rv) {
         QFx_setParent_noEvent(ctxt, rv);
     } else {
@@ -654,6 +663,14 @@ void QmlComponentPrivate::completeCreate()
         bindValues.clear();
         parserStatus.clear();
         completePending = false;
+        QmlEnginePrivate *p = QmlEnginePrivate::get(engine);
+        p->inProgressCreations--;
+        if (0 == p->inProgressCreations) {
+            while (p->erroredBindings) {
+                qWarning().nospace() << qPrintable(p->erroredBindings->error.toString());
+                p->erroredBindings->removeError();
+            }
+        }
     }
 }