diff -r 5dc02b23752f -r 3e2da88830cd src/declarative/qml/qdeclarativeglobalscriptclass_p.h --- a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h Tue Jul 06 15:10:48 2010 +0300 +++ b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h Wed Aug 18 10:37:55 2010 +0300 @@ -67,21 +67,18 @@ const QScriptString &name, QueryFlags flags, uint *id); - virtual QScriptValue property(const QScriptValue &object, - const QScriptString &name, uint id); - virtual void setProperty(QScriptValue &object, const QScriptString &name, uint id, const QScriptValue &value); - void explicitSetProperty(const QString &, const QScriptValue &); + void explicitSetProperty(const QStringList &, const QList &); - const QScriptValue &globalObject() const { return m_globalObject; } + const QScriptValue &staticGlobalObject() const { return m_staticGlobalObject; } const QSet &illegalNames() const { return m_illegalNames; } private: QSet m_illegalNames; - QScriptValue m_globalObject; + QScriptValue m_staticGlobalObject; }; QT_END_NAMESPACE