Simplify the defaultObjects handling

As the scope object is no longer added to the defaultObjects list
it makes sense that the root object remain constant at position 0

1 files changed, 6 insertions, 4 deletions

diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 3b89a23..c62756b 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -293,8 +293,7 @@ QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUnd
     QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
 
     if (secondaryScope)
-       ctxtPriv->defaultObjects.insert(ctxtPriv->highPriorityCount, 
-                                       secondaryScope);
+       ctxtPriv->defaultObjects.append(secondaryScope);
 
     QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
 
@@ -328,8 +327,11 @@ QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUnd
        return QVariant();
     }
 
-    if (secondaryScope)
-        ctxtPriv->defaultObjects.removeAt(ctxtPriv->highPriorityCount);
+    if (secondaryScope) {
+        QObject *last = ctxtPriv->defaultObjects.takeLast();
+        Q_ASSERT(last == secondaryScope);
+        Q_UNUSED(last);
+    }
 
     QVariant rv;