support global properties in JS imports

Example:
---foo.js---
SOMEVALUE="narf"

---myproject.qbp---
import 'foo.js' as Foo

Application {
    name: Foo.SOMEVALUE
}

Change-Id: I47b335f3408ff537aeb7a3b173ba6b90a1f33718
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/src/lib/tools/scripttools.cpp b/src/lib/tools/scripttools.cpp
index e2fe36ea9..7d55837f2 100644
--- a/src/lib/tools/scripttools.cpp
+++ b/src/lib/tools/scripttools.cpp
@@ -92,6 +92,15 @@ QScriptValue addJSImport(QScriptEngine *engine,
                          const QScriptProgram &program,
                          QScriptValue &targetObject)
 {
+    QSet<QString> globalPropertyNames;
+    {
+        QScriptValueIterator it(engine->globalObject());
+        while (it.hasNext()) {
+            it.next();
+            globalPropertyNames += it.name();
+        }
+    }
+
     engine->pushContext();
     QScriptValue result = engine->evaluate(program);
     QScriptValue activationObject = engine->currentContext()->activationObject();
@@ -112,6 +121,21 @@ QScriptValue addJSImport(QScriptEngine *engine,
     } else {
         targetObject = activationObject;
     }
+
+    // copy properties of the global object
+    QScriptValueIterator it(engine->globalObject());
+    while (it.hasNext()) {
+        it.next();
+        if (globalPropertyNames.contains(it.name()))
+            continue;
+
+        if (debugJSImports)
+            qDebug() << "inserting global property" << it.name() << it.value().toString();
+
+        targetObject.setProperty(it.name(), it.value());
+        it.remove();
+    }
+
     return result;
 }