diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 19:50:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 19:50:23 (GMT) |
| commit | 9789cdb6c3a6070fffb4644ce52cd176f44c3d48 (patch) | |
| tree | b212c313593040fd4ce247763ea737560d8fad1f | |
| parent | 9f3548b983aaac50a1ef638fece2e97145aa212b (diff) | |
| parent | 57a1049b86044ed28909b297412724b066453790 (diff) | |
| download | Qt-9789cdb6c3a6070fffb4644ce52cd176f44c3d48.zip Qt-9789cdb6c3a6070fffb4644ce52cd176f44c3d48.tar.gz Qt-9789cdb6c3a6070fffb4644ce52cd176f44c3d48.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Removed bogus autotest QFontMetrics::bearingIncludedInBoundingRect
| -rw-r--r-- | tests/auto/qfontmetrics/tst_qfontmetrics.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp index 46f2b15..6c91c7b 100644 --- a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp @@ -73,7 +73,6 @@ private slots: void averageCharWidth(); void elidedMultiLength(); void elidedMultiLengthF(); - void bearingIncludedInBoundingRect(); }; tst_QFontMetrics::tst_QFontMetrics() @@ -251,16 +250,5 @@ void tst_QFontMetrics::elidedMultiLengthF() elidedMultiLength_helper<QFontMetricsF>(); } -void tst_QFontMetrics::bearingIncludedInBoundingRect() -{ - QFont font; - font.setItalic(true); - QRect brectItalic = QFontMetrics(font).boundingRect("ITALIC"); - font.setItalic(false); - QRect brectNormal = QFontMetrics(font).boundingRect("ITALIC"); - - QVERIFY(brectItalic.width() > brectNormal.width()); -} - QTEST_MAIN(tst_QFontMetrics) #include "tst_qfontmetrics.moc" |