Harden QML binding optimizer

1 files changed, 4 insertions, 33 deletions

diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
index 4ec7191..c0389a8 100644
--- a/src/declarative/qml/qmlbinding.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 QML_DEFINE_NOCREATE_TYPE(QmlBinding);
 
 QmlBindingData::QmlBindingData()
-: updating(false), enabled(false), nextError(0), prevError(0)
+: updating(false), enabled(false)
 {
 }
 
@@ -78,37 +78,6 @@ void QmlBindingData::refresh()
     }
 }
 
-void QmlBindingData::removeError()
-{
-    if (!prevError) return;
-
-    if (nextError) nextError->prevError = prevError;
-    *prevError = nextError;
-    nextError = 0;
-    prevError = 0;
-}
-
-bool QmlBindingData::addError()
-{
-    if (prevError) return false;
-
-    QmlContext *c = context();
-    if (!c) return false;
-    QmlEngine *e = c->engine();
-    if (!e) return false;
-
-    QmlEnginePrivate *p = QmlEnginePrivate::get(e);
-
-    if (p->inProgressCreations == 0) return false; // Not in construction
-
-    prevError = &p->erroredBindings;
-    nextError = p->erroredBindings;
-    p->erroredBindings = this;
-    if (nextError) nextError->prevError = &nextError;
-
-    return true;
-}
-
 QmlBindingPrivate::QmlBindingPrivate()
 : QmlExpressionPrivate(new QmlBindingData)
 {
@@ -210,7 +179,9 @@ void QmlBinding::update(QmlMetaProperty::WriteFlags flags)
             }
 
             if (data->error.isValid()) {
-               if (!data->addError()) 
+                QmlEnginePrivate *p = (data->context() && data->context()->engine())?
+                    QmlEnginePrivate::get(data->context()->engine()):0;
+               if (!data->addError(p)) 
                    qWarning().nospace() << qPrintable(this->error().toString());
             } else {
                 data->removeError();