diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-28 06:00:08 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-28 06:00:08 (GMT) |
| commit | 38ec21238a82b9c886cd38ff293b617c6e3970c2 (patch) | |
| tree | f178549c6b96f315ddcff798776ee62e3a225553 /src/declarative/qml/qmlengine_p.h | |
| parent | 3a4c4ecb16827419fcb133744a7e97ed860cc669 (diff) | |
| parent | 00daed26e5cc52729d00b235addfe08b766a9c73 (diff) | |
| download | Qt-38ec21238a82b9c886cd38ff293b617c6e3970c2.zip Qt-38ec21238a82b9c886cd38ff293b617c6e3970c2.tar.gz Qt-38ec21238a82b9c886cd38ff293b617c6e3970c2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
| -rw-r--r-- | src/declarative/qml/qmlengine_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 7b459e9..18cdd83 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -193,9 +193,12 @@ public: bool resolveType(const Imports&, const QByteArray& type, QmlType** type_return, QUrl* url_return, ImportedNamespace** ns_return=0) const; void resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type, QmlType** type_return, QUrl* url_return ) const; + + static QScriptValue qmlScriptObject(QObject*, QmlEngine*); static QScriptValue createComponent(QScriptContext*, QScriptEngine*); static QScriptValue createQmlObject(QScriptContext*, QScriptEngine*); + static QScriptEngine *getScriptEngine(QmlEngine *e) { return &e->d_func()->scriptEngine; } static QmlEnginePrivate *get(QmlEngine *e) { return e->d_func(); } }; |