Fix autotest of textEditTest to use currentFont() instead of font()

Change-Id: I5c9b2ad494a7daf9b07804f77c4692d49e774261
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
bb10
Jan Arve Saether 2013-01-04 09:20:21 +01:00 committed by The Qt Project
parent ad330f327e
commit 32f7db7686
1 changed files with 3 additions and 3 deletions

View File

@ -1532,7 +1532,7 @@ static QRect characterRect(const QTextEdit &edit, int offset)
QPointF layoutPosition = layout->position();
int relativeOffset = offset - block.position();
QTextLine line = layout->lineForTextPosition(relativeOffset);
QFontMetrics fm(edit.font());
QFontMetrics fm(edit.currentFont());
QChar ch = edit.document()->characterAt(offset);
int w = fm.width(ch);
int h = fm.height();
@ -1559,7 +1559,7 @@ void tst_QAccessibility::textEditTest()
QFont font("Helvetica");
font.setPointSizeF(12.5);
font.setWordSpacing(1.1);
edit.setFont(font);
edit.setCurrentFont(font);
}
edit.show();
@ -1573,7 +1573,7 @@ void tst_QAccessibility::textEditTest()
QCOMPARE(startOffset, 13);
QCOMPARE(endOffset, 31);
QCOMPARE(iface->textInterface()->characterCount(), 48);
QFontMetrics fm(edit.font());
QFontMetrics fm(edit.currentFont());
QCOMPARE(iface->textInterface()->characterRect(0).size(), QSize(fm.width("h"), fm.height()));
QCOMPARE(iface->textInterface()->characterRect(5).size(), QSize(fm.width(" "), fm.height()));
QCOMPARE(iface->textInterface()->characterRect(6).size(), QSize(fm.width("w"), fm.height()));