Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove misspelled comment in tst_qtextdocument.cpp
2011-05-05 22:02:54 +10:00 · 2011-05-05 22:02:54 +10:00 · c8cd071d40
parent 948d5f22c3 45b80f054f
commit c8cd071d40
1 changed files with 1 additions and 1 deletions
--- a/tests/auto/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp
@ -2742,7 +2742,7 @@ void tst_QTextDocument::copiedFontSize()
    QTextDocument documentOutput;

    QFont fontInput;
-    fontInput.setPixelSize(24);  // With pixels font size is not transfered in html
+    fontInput.setPixelSize(24);

    QTextCursor cursorInput(&documentInput);
    QTextCharFormat formatInput = cursorInput.charFormat();