diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-03 07:14:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-03 07:15:01 (GMT) |
| commit | 4690084e9f3fbf3635aa3fb6a8025ae046672aea (patch) | |
| tree | e691c0745411ae0075cd507bc14799cc30c68124 /src/declarative/qml/qdeclarativeglobalscriptclass_p.h | |
| parent | aebadf248a93458615a53b3480987f829aba0ee6 (diff) | |
| download | Qt-4690084e9f3fbf3635aa3fb6a8025ae046672aea.zip Qt-4690084e9f3fbf3635aa3fb6a8025ae046672aea.tar.gz Qt-4690084e9f3fbf3635aa3fb6a8025ae046672aea.tar.bz2 | |
Move JS global scope to top of the QML scope chain
QT-2787
Diffstat (limited to 'src/declarative/qml/qdeclarativeglobalscriptclass_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeglobalscriptclass_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h index a33cf5e..1b34aee 100644 --- a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h +++ b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h @@ -54,6 +54,7 @@ // #include <QtScript/qscriptclass.h> +#include <QtCore/qset.h> QT_BEGIN_NAMESPACE @@ -74,8 +75,12 @@ public: void explicitSetProperty(const QString &, const QScriptValue &); + const QScriptValue &globalObject() const { return m_globalObject; } + const QSet<QString> &illegalNames() const { return m_illegalNames; } + private: - QScriptValue globalObject; + QSet<QString> m_illegalNames; + QScriptValue m_globalObject; }; QT_END_NAMESPACE |