1 files changed, 20 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
index 35cb2b4..6e107fb 100644
--- a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
@@ -98,9 +98,7 @@ QDeclarativeGlobalScriptClass::property(const QScriptValue &object,
     Q_UNUSED(object);
     Q_UNUSED(name);
     Q_UNUSED(id);
-    QString error = QLatin1String("Cannot access non-existent property \"") + 
-                    name.toString() + QLatin1Char('\"');
-    return engine()->currentContext()->throwError(error);
+    return engine()->undefinedValue();
 }
 
 void QDeclarativeGlobalScriptClass::setProperty(QScriptValue &object, 
@@ -115,5 +113,24 @@ void QDeclarativeGlobalScriptClass::setProperty(QScriptValue &object,
     engine()->currentContext()->throwError(error);
 }
 
+/* This method is for the use of tst_qdeclarativeecmascript::callQtInvokables() only */
+void QDeclarativeGlobalScriptClass::explicitSetProperty(const QString &name, const QScriptValue &value)
+{
+    QScriptValue globalObject = engine()->globalObject();
+
+    QScriptValue v = engine()->newObject();
+
+    QScriptValueIterator iter(v);
+    while (iter.hasNext()) {
+        iter.next();
+        v.setProperty(iter.scriptName(), iter.value());
+    }
+
+    v.setProperty(name, value);
+    v.setScriptClass(this);
+
+    engine()->setGlobalObject(v);
+}
+
 QT_END_NAMESPACE