diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-04-27 06:52:38 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-04-27 06:52:38 (GMT) |
| commit | 6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb (patch) | |
| tree | 68d6c4928dbd91d50e08b5b9d09a1178dffad092 /src/declarative/qml/qmlcompiler_p.h | |
| parent | 5d8ce4c43c3c2816cd5dca03ddd429f26b96d34d (diff) | |
| parent | 7e94543a9b013b6b1140137ba64406b74a363afc (diff) | |
| download | Qt-6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb.zip Qt-6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb.tar.gz Qt-6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git://scm.dev.nokia.troll.no/qt/kinetic into kinetic-declarativeui-qfx
Diffstat (limited to 'src/declarative/qml/qmlcompiler_p.h')
| -rw-r--r-- | src/declarative/qml/qmlcompiler_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h index b51eacd..2a06f73 100644 --- a/src/declarative/qml/qmlcompiler_p.h +++ b/src/declarative/qml/qmlcompiler_p.h @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE class QmlEngine; class QmlComponent; class QmlCompiledComponent; +class QmlContext; namespace QmlParser { class Object; @@ -82,7 +83,7 @@ public: QmlCustomParser *parser; QmlRefCount *ref; - QObject *createInstance() const; + QObject *createInstance(QmlContext *) const; }; QList<TypeReference> types; struct CustomTypeData |