Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integrationv4.8.0-beta

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Doc: Fixing typo

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/auto/qtextcursor/tst_qtextcursor.cpp b/tests/auto/qtextcursor/tst_qtextcursor.cpp
index bb5a212..2b0ba42 100644
--- a/tests/auto/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/qtextcursor/tst_qtextcursor.cpp
@@ -1302,7 +1302,7 @@ void tst_QTextCursor::selectVisually()
 
     cursor.setPosition(6); // somewhere in the long paragraph.
     cursor.select(QTextCursor::LineUnderCursor);
-    // since we are not yet layed-out, we expect the whole paragraph to be selected.
+    // since we are not yet laid-out, we expect the whole paragraph to be selected.
     QCOMPARE(cursor.position(), 77);
     QCOMPARE(cursor.anchor(), 4);
 }