Remove unnecessary global context management stuff

1 files changed, 4 insertions, 6 deletions

diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 0e68f8a..c7d45fd 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -405,9 +405,10 @@ QString QmlComponent::errorsString() const
     QString ret;
     if(!isError())
         return ret;
-    foreach(const QmlError &e, d->errors){
-        ret += e.url().toString() + ":" + QString::number(e.line()) + " "
-                + e.description() + "\n";
+    foreach(const QmlError &e, d->errors) {
+        ret += e.url().toString() + QLatin1String(":") + 
+               QString::number(e.line()) + QLatin1String(" ") + 
+               e.description() + QLatin1String("\n");
     }
     return ret;
 }
@@ -532,7 +533,6 @@ QObject *QmlComponent::beginCreate(QmlContext *context)
         static_cast<QmlContextPrivate*>(ctxt->d_ptr)->startLine = d->cc->bytecode.at(d->start - 1).line;
         static_cast<QmlContextPrivate*>(ctxt->d_ptr)->endLine = d->cc->bytecode.at(d->start - 1).createComponent.endLine;
     }
-    ctxt->activate();
 
     QmlVME vme;
     QObject *rv = vme.run(ctxt, d->cc, d->start, d->count);
@@ -540,8 +540,6 @@ QObject *QmlComponent::beginCreate(QmlContext *context)
     if (vme.isError()) 
         d->errors = vme.errors();
 
-    ctxt->deactivate();
-
     QmlEnginePrivate *ep = d->engine->d_func();
     if (ep->rootComponent == this) {
         ep->rootComponent = 0;