1 files changed, 84 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index 782c0d7..2b8cf70 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -606,6 +606,75 @@ void QDeclarativeContextData::addObject(QObject *o)
     contextObjects = data;
 }
 
+void QDeclarativeContextData::addImportedScript(const QDeclarativeParser::Object::ScriptBlock &script)
+{
+    if (!engine) 
+        return;
+
+    Q_ASSERT(script.codes.count() == 1);
+
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    const QString &code = script.codes.at(0);
+    const QString &url = script.files.at(0);
+    const QDeclarativeParser::Object::ScriptBlock::Pragmas &pragmas = script.pragmas.at(0);
+
+    Q_ASSERT(!url.isEmpty());
+
+    if (pragmas & QDeclarativeParser::Object::ScriptBlock::Shared) {
+
+        QHash<QString, QScriptValue>::Iterator iter = enginePriv->m_sharedScriptImports.find(url);
+        if (iter == enginePriv->m_sharedScriptImports.end()) {
+            QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
+
+            scriptContext->pushScope(enginePriv->globalClass->globalObject());
+        
+            QScriptValue scope = scriptEngine->newObject();
+            scriptContext->setActivationObject(scope);
+            scriptContext->pushScope(scope);
+
+            scriptEngine->evaluate(code, url, 1);
+
+            if (scriptEngine->hasUncaughtException()) {
+                QDeclarativeError error;
+                QDeclarativeExpressionPrivate::exceptionToError(scriptEngine, error);
+                qWarning().nospace() << qPrintable(error.toString());
+            }
+
+            scriptEngine->popContext();
+
+            iter = enginePriv->m_sharedScriptImports.insert(url, scope);
+        }
+
+        importedScripts.append(*iter);
+
+    } else {
+
+        QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
+
+        scriptContext->pushScope(enginePriv->contextClass->newContext(this, 0));
+        scriptContext->pushScope(enginePriv->globalClass->globalObject());
+        
+        QScriptValue scope = scriptEngine->newObject();
+        scriptContext->setActivationObject(scope);
+        scriptContext->pushScope(scope);
+
+        scriptEngine->evaluate(code, url, 1);
+
+        if (scriptEngine->hasUncaughtException()) {
+            QDeclarativeError error;
+            QDeclarativeExpressionPrivate::exceptionToError(scriptEngine, error);
+            qWarning().nospace() << qPrintable(error.toString());
+        }
+
+        scriptEngine->popContext();
+
+        importedScripts.append(scope);
+
+    }
+}
+
 void QDeclarativeContextData::addScript(const QDeclarativeParser::Object::ScriptBlock &script, 
                                         QObject *scopeObject)
 {
@@ -655,6 +724,21 @@ void QDeclarativeContextData::setIdPropertyData(QDeclarativeIntegerCache *data)
     idValues = new ContextGuard[idValueCount];
 }
 
+QString QDeclarativeContextData::findObjectId(const QObject *obj) const
+{
+    if (!idValues || !propertyNames)
+        return QString();
+
+    for (int i=0; i<idValueCount; i++) {
+        if (idValues[i] == obj)
+            return propertyNames->findId(i);
+    }    
+
+    if (linkedContext)
+        return linkedContext->findObjectId(obj);
+    return QString();
+}
+
 QDeclarativeContext *QDeclarativeContextData::asQDeclarativeContext()
 {
     if (!publicContext)