diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-09 12:57:12 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-09 04:50:11 +0100 |
| commit | 0fe8a713351ae7754cfe4704cb2ec0b8c6a00ece (patch) | |
| tree | d93c5739d7365f7b4a83651483aba50a103396b0 /tests/auto/declarative/qdeclarativetext | |
| parent | ead8585b2b1504e34829de3e22531620634e4c66 (diff) | |
Fix QQDeclarativeText expected failure.
lineHeight isn't supported for RichText textFormat which is the default
for auto text with tags so StyledText must be set explicitly.
Task-number: QTBUG-21015
Change-Id: Ic34c47170e3d9ccc5958ffc32aa335e228471b72
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativetext')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index c28e2a78..d2ae384a 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -1227,17 +1227,16 @@ void tst_qdeclarativetext::lineHeight() QCOMPARE(myText->height(), myText->lineCount() * 20.0); myText->setText("Lorem ipsum sit <b>amet</b>, consectetur adipiscing elit. Integer felis nisl, varius in pretium nec, venenatis non erat. Proin lobortis interdum dictum."); + myText->setTextFormat(QDeclarativeText::StyledText); myText->setLineHeightMode(QDeclarativeText::ProportionalHeight); myText->setLineHeight(1.0); qreal h2 = myText->height(); myText->setLineHeight(2.0); - QEXPECT_FAIL("", "QTBUG-17325", Continue); QVERIFY(myText->height() == h2 * 2.0); myText->setLineHeightMode(QDeclarativeText::FixedHeight); myText->setLineHeight(10); - QEXPECT_FAIL("", "QTBUG-17325", Continue); QCOMPARE(myText->height(), myText->lineCount() * 10.0); delete canvas; |