diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-28 01:01:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-28 01:01:19 (GMT) |
| commit | bb8fcc568f63ea1ba2107ebbba3845073f378d94 (patch) | |
| tree | 83da43a476510c874c92110ccc72c18f7214e900 /src/declarative/qml/qdeclarativeglobalscriptclass_p.h | |
| parent | 43697c982237f634f89ce661b1b363b8bfa383a7 (diff) | |
| parent | 59c58576efd3ceff7add46a359fd99e56a2fb279 (diff) | |
| download | Qt-bb8fcc568f63ea1ba2107ebbba3845073f378d94.zip Qt-bb8fcc568f63ea1ba2107ebbba3845073f378d94.tar.gz Qt-bb8fcc568f63ea1ba2107ebbba3845073f378d94.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/declarative/qml/qdeclarativeglobalscriptclass.cpp
Diffstat (limited to 'src/declarative/qml/qdeclarativeglobalscriptclass_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeglobalscriptclass_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h index fb44e5d..b42b7bd 100644 --- a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h +++ b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h @@ -72,13 +72,13 @@ public: void explicitSetProperty(const QStringList &, const QList<QScriptValue> &); - const QScriptValue &globalObject() const { return m_globalObject; } + const QScriptValue &staticGlobalObject() const { return m_staticGlobalObject; } const QSet<QString> &illegalNames() const { return m_illegalNames; } private: QSet<QString> m_illegalNames; - QScriptValue m_globalObject; + QScriptValue m_staticGlobalObject; }; QT_END_NAMESPACE |