diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2011-03-17 04:41:40 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2011-03-17 04:44:35 (GMT) |
| commit | 50c0c6a032ef2c0af8c93f52f5c2f86ca145e852 (patch) | |
| tree | e89bc539900dcea00b9ce88afd7f692ea075a8ff | |
| parent | 234a4b614e30ec2ad3e161c0dcd4d339182ff9ec (diff) | |
| download | Qt-50c0c6a032ef2c0af8c93f52f5c2f86ca145e852.zip Qt-50c0c6a032ef2c0af8c93f52f5c2f86ca145e852.tar.gz Qt-50c0c6a032ef2c0af8c93f52f5c2f86ca145e852.tar.bz2 | |
Re-enable lineHeight tests.
These tests were disabled by 24d8e96624af91ab01a20c10625858300f16099b
Change-Id: I5bf3e11dfb3c975415c3039b39a39c22984d2900
| -rw-r--r-- | tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index 2d52642..581b58c 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -1206,13 +1206,13 @@ void tst_qdeclarativetext::lineHeight() myText->setLineHeightMode(QDeclarativeText::ProportionalHeight); myText->setLineHeight(1.0); - //qreal h2 = myText->height(); + qreal h2 = myText->height(); myText->setLineHeight(2.0); - //QVERIFY(myText->height() == h2 * 2.0); + QVERIFY(myText->height() == h2 * 2.0); myText->setLineHeightMode(QDeclarativeText::FixedHeight); myText->setLineHeight(10); - //QCOMPARE(myText->height(), myText->lineCount() * 10.0); + QCOMPARE(myText->height(), myText->lineCount() * 10.0); delete canvas; } |