diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-11 11:50:37 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-11 11:50:37 (GMT) |
| commit | c6ed32dc7e9c8a566f376d1baa7e616a1019f9af (patch) | |
| tree | 95ce43172963aa266630d8836ccb6b23dde78991 /src/declarative/qml/qdeclarativeinstruction.cpp | |
| parent | 9986c3f0c0681c7ea8bc8e5cfea5662880db6654 (diff) | |
| parent | 5fa15620d09df1164cc28aa9b1e646a61f87e909 (diff) | |
| download | Qt-c6ed32dc7e9c8a566f376d1baa7e616a1019f9af.zip Qt-c6ed32dc7e9c8a566f376d1baa7e616a1019f9af.tar.gz Qt-c6ed32dc7e9c8a566f376d1baa7e616a1019f9af.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/qdeclarativeinstruction.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeinstruction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp index 0f7b09d..1767d2f 100644 --- a/src/declarative/qml/qdeclarativeinstruction.cpp +++ b/src/declarative/qml/qdeclarativeinstruction.cpp @@ -218,7 +218,7 @@ void QDeclarativeCompiledData::dump(QDeclarativeInstruction *instr, int idx) qWarning().nospace() << idx << "\t\t" << line << "\t" << "DEFER" << "\t\t\t" << instr->defer.deferCount; break; default: - qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKOWN INSTRUCTION" << "\t" << instr->type; + qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKNOWN INSTRUCTION" << "\t" << instr->type; break; } #endif // QT_NO_DEBUG_STREAM |