diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-23 01:50:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-23 01:50:48 (GMT) |
| commit | 28cec90fd8740f1d47010d99699f86ac014e9926 (patch) | |
| tree | d3ff8dd0eec3bf5c6536960650490cb4cc382396 /src/declarative/qml/qmlcompiler.cpp | |
| parent | 0e8b82bc7b9b0d88e8cc4a4d293851795d35950a (diff) | |
| download | Qt-28cec90fd8740f1d47010d99699f86ac014e9926.zip Qt-28cec90fd8740f1d47010d99699f86ac014e9926.tar.gz Qt-28cec90fd8740f1d47010d99699f86ac014e9926.tar.bz2 | |
Merge in changes to old kinetic-dui branch.
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 9af0a06..f03ce20 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -448,7 +448,7 @@ void QmlCompiler::reset(QmlCompiledComponent *cc, bool deleteMemory) } bool QmlCompiler::compile(QmlEngine *engine, - QmlCompositeTypeManager::TypeData *unit, + QmlCompositeTypeData *unit, QmlCompiledComponent *out) { #ifdef Q_ENABLE_PERFORMANCE_LOG @@ -463,7 +463,7 @@ bool QmlCompiler::compile(QmlEngine *engine, // Compile types for(int ii = 0; ii < unit->types.count(); ++ii) { - QmlCompositeTypeManager::TypeData::TypeReference &tref = unit->types[ii]; + QmlCompositeTypeData::TypeReference &tref = unit->types[ii]; QmlCompiledComponent::TypeReference ref; if(tref.type) ref.type = tref.type; |