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
This commit is contained in:
Qt Continuous Integration System 2011-05-05 22:02:54 +10:00
commit c8cd071d40

View File

@ -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();