diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-04 12:18:42 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-09 10:37:17 (GMT) |
| commit | b7082fec87305d61fe7021340a36d28bd4a33c37 (patch) | |
| tree | b2685393f0e2b8f9d2f6197eca5a33ba610e965f /tests/auto/declarative/qdeclarativetext | |
| parent | ac60946777c55cf19ee0fc5ae1f60d3c75146e6f (diff) | |
| download | Qt-b7082fec87305d61fe7021340a36d28bd4a33c37.zip Qt-b7082fec87305d61fe7021340a36d28bd4a33c37.tar.gz Qt-b7082fec87305d61fe7021340a36d28bd4a33c37.tar.bz2 | |
Revert part of commit 7c1ab9b6a8
It was not properly merged in master because of conflicts, and
we have now a public API for this
Added QEXPECT_FAIL and opened QTBUG-17325
Diffstat (limited to 'tests/auto/declarative/qdeclarativetext')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index 320a6e7..f1157f5 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -1103,6 +1103,7 @@ void tst_qdeclarativetext::lineHeight() qreal h = myText->height(); myText->setLineHeight(1.5); + QEXPECT_FAIL("", "QTBUG-17325", Continue); QVERIFY(myText->height() == h * 1.5); myText->setLineHeightMode(QDeclarativeText::PixelHeight); @@ -1115,10 +1116,12 @@ void tst_qdeclarativetext::lineHeight() qreal h2 = myText->height(); myText->setLineHeight(2.0); + QEXPECT_FAIL("", "QTBUG-17325", Continue); QVERIFY(myText->height() == h2 * 2.0); myText->setLineHeightMode(QDeclarativeText::PixelHeight); myText->setLineHeight(10); + QEXPECT_FAIL("", "QTBUG-17325", Continue); QCOMPARE(myText->height(), myText->lineCount() * 10.0); delete canvas; |