diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-17 02:58:35 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-17 02:58:35 (GMT) |
| commit | 1dcc60793f16e5922887a6fb2abff7d6fbe7146c (patch) | |
| tree | 0950e1f4c48d9d1b8d4d907816f4c33ed1e67cf9 /src/declarative/qml/qdeclarativevmemetaobject_p.h | |
| parent | 20470e30d11733ada5443ff993d8518aa14737ca (diff) | |
| parent | 349df5c1ec50fde17a2dbf94af64ed76c55d7aaf (diff) | |
| download | Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.zip Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.tar.gz Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativevmemetaobject_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativevmemetaobject_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h index 37c0b7a..e11f6fa 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject_p.h +++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h @@ -63,6 +63,7 @@ #include "qdeclarativeguard_p.h" #include "qdeclarativecompiler_p.h" +#include "qdeclarativecontext_p.h" QT_BEGIN_NAMESPACE @@ -121,7 +122,7 @@ protected: private: QObject *object; QDeclarativeCompiledData *compiledData; - QDeclarativeGuard<QDeclarativeContext> ctxt; + QDeclarativeGuardedContextData ctxt; const QDeclarativeVMEMetaData *metaData; int propOffset; |