diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 22:02:54 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 22:02:54 +1000 |
| commit | c8cd071d40ce58d2947639de4705bf547c4a0fca (patch) | |
| tree | 091fa858820373454124c1adcd309b8f76add5b3 | |
| parent | 948d5f22c309899657a9397e516d5892b02804c0 (diff) | |
| parent | 45b80f054fb729ec94714ee1a5f6145352be0296 (diff) | |
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
| -rw-r--r-- | tests/auto/qtextdocument/tst_qtextdocument.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp index 26fa43d137..7aa6578e86 100644 --- 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(); |