diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-09-01 11:07:47 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-09-01 11:07:47 (GMT) |
| commit | 63129c8bd21bfdc8110680296bb3bc1ab5e43343 (patch) | |
| tree | 0b797ce849c191942713b618068aba0619788d57 /src/declarative/qml/qdeclarativeengine_p.h | |
| parent | d3b898e973662707f9644b4fe5f8d18849929723 (diff) | |
| parent | dcb98430f6add24c9d54253bd35d35010cc75c23 (diff) | |
| download | Qt-63129c8bd21bfdc8110680296bb3bc1ab5e43343.zip Qt-63129c8bd21bfdc8110680296bb3bc1ab5e43343.tar.gz Qt-63129c8bd21bfdc8110680296bb3bc1ab5e43343.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index db2db35..dc7315d 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -56,7 +56,7 @@ #include "qdeclarativeengine.h" #include "private/qdeclarativeclassfactory_p.h" -#include "private/qdeclarativecompositetypemanager_p.h" +#include "private/qdeclarativetypeloader_p.h" #include "private/qdeclarativeimport_p.h" #include "private/qpodvector_p.h" #include "qdeclarative.h" @@ -239,7 +239,7 @@ public: mutable QMutex mutex; - QDeclarativeCompositeTypeManager typeManager; + QDeclarativeTypeLoader typeLoader; QDeclarativeImportDatabase importDatabase; QString offlineStoragePath; |