diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-16 23:09:00 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-16 23:09:00 (GMT) |
| commit | 8c216aee5d2e52b6fa36e256615374b9435bb4c9 (patch) | |
| tree | c65554b66874dae21a0876f804926254073aedd0 /src/declarative/qml/qdeclarativeglobalscriptclass_p.h | |
| parent | 3340b23699f0286876f1e237a66bdc85076fe191 (diff) | |
| parent | 3849cd0cca618fac88a54861a3ec30780711ce75 (diff) | |
| download | Qt-8c216aee5d2e52b6fa36e256615374b9435bb4c9.zip Qt-8c216aee5d2e52b6fa36e256615374b9435bb4c9.tar.gz Qt-8c216aee5d2e52b6fa36e256615374b9435bb4c9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeglobalscriptclass_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeglobalscriptclass_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h index 1b34aee..7690edd 100644 --- a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h +++ b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h @@ -76,6 +76,7 @@ public: void explicitSetProperty(const QString &, const QScriptValue &); const QScriptValue &globalObject() const { return m_globalObject; } + const QSet<QString> &illegalNames() const { return m_illegalNames; } private: |