Disallow global object properties as property names

QTBUG-11605

1 files changed, 4 insertions, 0 deletions

diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
index f29b3f4..3e22c82 100644
--- a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
@@ -55,6 +55,7 @@ QDeclarativeGlobalScriptClass::QDeclarativeGlobalScriptClass(QScriptEngine *engi
 : QScriptClass(engine)
 {
     QString eval = QLatin1String("eval");
+    QString version = QLatin1String("version");
 
     QScriptValue globalObject = engine->globalObject();
 
@@ -68,6 +69,9 @@ QDeclarativeGlobalScriptClass::QDeclarativeGlobalScriptClass(QScriptEngine *engi
 
         QString name = iter.name();
 
+        if (name == version)
+            continue;
+
         if (name != eval)
             m_globalObject.setProperty(iter.scriptName(), iter.value());
         newGlobalObject.setProperty(iter.scriptName(), iter.value());