diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-11-09 01:23:37 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-11-09 01:23:37 (GMT) |
| commit | 6b8a95b2521d843ec2b3f7c787c15b92e4ea686f (patch) | |
| tree | 346bc8925d83b2729f485d1259729fca931de07d /src/declarative/qml/qdeclarativecompiler_p.h | |
| parent | bb8f085611f4cb91b7bde7220d407948edcc572c (diff) | |
| parent | e00af84cc9230df411981d2f3b9296b61d5d1c50 (diff) | |
| download | Qt-6b8a95b2521d843ec2b3f7c787c15b92e4ea686f.zip Qt-6b8a95b2521d843ec2b3f7c787c15b92e4ea686f.tar.gz Qt-6b8a95b2521d843ec2b3f7c787c15b92e4ea686f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h index 89eef09..43a0901 100644 --- a/src/declarative/qml/qdeclarativecompiler_p.h +++ b/src/declarative/qml/qdeclarativecompiler_p.h @@ -93,10 +93,11 @@ public: QByteArray className; QDeclarativeType *type; - QDeclarativeComponent *component; +// QDeclarativeComponent *component; + QDeclarativeCompiledData *component; QDeclarativeRefCount *ref; - QObject *createInstance(QDeclarativeContextData *, const QBitField &) const; + QObject *createInstance(QDeclarativeContextData *, const QBitField &, QList<QDeclarativeError> *) const; const QMetaObject *metaObject() const; }; QList<TypeReference> types; |