diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-12-02 05:47:29 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-12-02 05:47:29 (GMT) |
| commit | d9735849834a5efc638dd026d6fe51d15dc528ee (patch) | |
| tree | 3313bf43000feffb4cffe4e1f119fda45c60877f /src/declarative/qml/qmlcontextscriptclass_p.h | |
| parent | 289645d2bf46c1d6eace7a0d60389a9c10dd0c34 (diff) | |
| parent | dd0959ed872bf0cda7ad88382abce0c4b20bbdea (diff) | |
| download | Qt-d9735849834a5efc638dd026d6fe51d15dc528ee.zip Qt-d9735849834a5efc638dd026d6fe51d15dc528ee.tar.gz Qt-d9735849834a5efc638dd026d6fe51d15dc528ee.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlmetatype.cpp
Diffstat (limited to 'src/declarative/qml/qmlcontextscriptclass_p.h')
| -rw-r--r-- | src/declarative/qml/qmlcontextscriptclass_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlcontextscriptclass_p.h b/src/declarative/qml/qmlcontextscriptclass_p.h index cf91242..d24dfa6 100644 --- a/src/declarative/qml/qmlcontextscriptclass_p.h +++ b/src/declarative/qml/qmlcontextscriptclass_p.h @@ -68,6 +68,7 @@ public: ~QmlContextScriptClass(); QScriptValue newContext(QmlContext *, QObject * = 0); + QScriptValue newSharedContext(); QmlContext *contextFromValue(const QScriptValue &); |