Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
  Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
  add performance comparisons to qregexp benchmark
  configure: fix error message when calling config.status
  Fix invalid memory write during recursive timer activation
  Added comment about calendarPopup in setCalendarWidget function documentation.
  doc: Fixed some qdoc errors.
  Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
  CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
  XmlListModel doc fixes
  Mention QML_IMPORT_TRACE in Modules docs
  Merge sections about when property and default state
  Explain Flipable example further
  PathView required some diagonal movement before a drag was initiated.
  doc: Fixed some qdoc errors.
  doc: Fixed some qdoc errors.
  OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0.
  doc: Fixed some qdoc errors.
  Add Ukrainian translation.
  doc: Fixed some qdoc errors.
  doc: Fixed some qdoc errors.
  ...

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