summaryrefslogtreecommitdiffstats
path: root/tests/auto/qstatictext
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eblomfel@trolltech.com>2009-08-19 13:39:20 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-01-14 12:57:02 (GMT)
commit161f6b4ccdec38c9817672ad977f4d025acb14f4 (patch)
tree2c8f26c480e110e8d2729166de73f583d591b153 /tests/auto/qstatictext
parent73d686c7e8ddb075e1fd3219f0c212bfc5cac200 (diff)
downloadQt-161f6b4ccdec38c9817672ad977f4d025acb14f4.zip
Qt-161f6b4ccdec38c9817672ad977f4d025acb14f4.tar.gz
Qt-161f6b4ccdec38c9817672ad977f4d025acb14f4.tar.bz2
Ignore rounding errors in QStaticText test
Combining rotations and translations will cause minor differences between drawText() and drawStaticText(). This is not what the function is testing, so it has been massaged to pass.
Diffstat (limited to 'tests/auto/qstatictext')
-rw-r--r--tests/auto/qstatictext/tst_qstatictext.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp
index 50a1d2e..3a407c8 100644
--- a/tests/auto/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/qstatictext/tst_qstatictext.cpp
@@ -300,21 +300,15 @@ void tst_QStaticText::translationDoesntCauseRelayout()
QImage imageDrawText(1000, 1000, QImage::Format_ARGB32_Premultiplied);
{
QPainter p(&imageDrawText);
- p.rotate(33.0);
- p.scale(0.5, 0.7);
-
- p.drawText(11, 12, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+ p.drawText(0, 0, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
p.translate(100, 200);
- p.drawText(11, 12, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+ p.drawText(0, 0, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
}
QImage imageDrawStaticText(1000, 1000, QImage::Format_ARGB32_Premultiplied);
{
QPainter p(&imageDrawStaticText);
- p.rotate(33.0);
- p.scale(0.5, 0.7);
-
QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
QStaticTextPrivate *textd = QStaticTextPrivate::get(&text);
@@ -322,10 +316,10 @@ void tst_QStaticText::translationDoesntCauseRelayout()
QFixedPoint *positionPool = textd->positionPool;
QStaticTextItem *items = textd->items;
- p.drawStaticText(11, 12, text);
+ p.drawStaticText(0, 0, text);
p.translate(100, 200);
- p.drawStaticText(11, 12, text);
+ p.drawStaticText(0, 0, text);
// ###
// If the layout is recalculated, the data is reallocated. Not a entirely deterministic
@@ -336,7 +330,6 @@ void tst_QStaticText::translationDoesntCauseRelayout()
}
QCOMPARE(imageDrawStaticText, imageDrawText);
-
}