fix imports/extensions for script properties

Import directives in files of imported items were ignored for prepare
scripts. We must use the file context (that contains the imports)
of the file where the script property is set.

Change-Id: Icca3fc84dd1e130446775122b7b58e6e9ddced98
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 2 insertions, 4 deletions

diff --git a/src/lib/buildgraph/buildgraph.cpp b/src/lib/buildgraph/buildgraph.cpp
index 3b0e9d438..d868d28b2 100644
--- a/src/lib/buildgraph/buildgraph.cpp
+++ b/src/lib/buildgraph/buildgraph.cpp
@@ -199,8 +199,8 @@ void setupScriptEngineForProduct(ScriptEngine *engine, const ResolvedProductCons
     cache->productScriptValue.setProperty(QLatin1String("moduleName"),
             rule->module->name.isEmpty() ? QScriptValue() : rule->module->name);
 
-    engine->import(rule->jsImports, targetObject, targetObject);
-    JsExtensions::setupExtensions(rule->jsExtensions, targetObject);
+    engine->import(rule->script->fileContext->jsImports, targetObject, targetObject);
+    JsExtensions::setupExtensions(rule->script->fileContext->jsExtensions, targetObject);
 }
 
 bool findPath(Artifact *u, Artifact *v, QList<Artifact*> &path)
diff --git a/src/lib/buildgraph/projectbuilddata.cpp b/src/lib/buildgraph/projectbuilddata.cpp
index 452a99675..aa39646db 100644
--- a/src/lib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/buildgraph/projectbuilddata.cpp
@@ -298,8 +298,6 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc
         trafos += TrafoPair(rtrafo, transformer);
         transformer->inputs = inputArtifacts;
         const RulePtr rule = Rule::create();
-        rule->jsImports = rtrafo->jsImports;
-        rule->jsExtensions = rtrafo->jsExtensions;
         ResolvedModulePtr module = ResolvedModule::create();
         module->name = rtrafo->module->name;
         rule->module = module;