diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 15:24:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 15:24:03 (GMT) |
| commit | e06d011cc08de370ece3b0c324b0a735a2625820 (patch) | |
| tree | 8d421f70a35e258621abdb3a99df136805371aae /tests/auto | |
| parent | b18ed8179f7289f700e7e8c280b3f68fefc7097d (diff) | |
| parent | b0514ccdd318e2e508edab57bfd7ed064a550308 (diff) | |
| download | Qt-e06d011cc08de370ece3b0c324b0a735a2625820.zip Qt-e06d011cc08de370ece3b0c324b0a735a2625820.tar.gz Qt-e06d011cc08de370ece3b0c324b0a735a2625820.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Minimal fix to get the svgalib example to compile
Fix alignment of text with negative right bearing
Renamed QPainter::Fragment/Hint -> QPainter::PixmapFragment/Hint
QTreeView: let the dataChanged signal refresh the hasChildren attribute.
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qpainter/tst_qpainter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index a03b2c7..701dc2e 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -999,10 +999,10 @@ void tst_QPainter::drawPixmapFragments() { QPixmap origPixmap(20, 20); QPixmap resPixmap(20, 20); - QPainter::Fragment fragments[4] = { {15, 15, 0, 0, 10, 10, 1, 1, 0, 1}, - { 5, 15, 10, 0, 10, 10, 1, 1, 0, 1}, - {15, 5, 0, 10, 10, 10, 1, 1, 0, 1}, - { 5, 5, 10, 10, 10, 10, 1, 1, 0, 1} }; + QPainter::PixmapFragment fragments[4] = { {15, 15, 0, 0, 10, 10, 1, 1, 0, 1}, + { 5, 15, 10, 0, 10, 10, 1, 1, 0, 1}, + {15, 5, 0, 10, 10, 10, 1, 1, 0, 1}, + { 5, 5, 10, 10, 10, 10, 1, 1, 0, 1} }; { QPainter p(&origPixmap); p.fillRect(0, 0, 10, 10, Qt::red); @@ -1025,7 +1025,7 @@ void tst_QPainter::drawPixmapFragments() QVERIFY(resImage.pixel(15, 15) == origImage.pixel(5, 5)); - QPainter::Fragment fragment = QPainter::Fragment::create(QPointF(20, 20), QRectF(30, 30, 2, 2)); + QPainter::PixmapFragment fragment = QPainter::PixmapFragment::create(QPointF(20, 20), QRectF(30, 30, 2, 2)); QVERIFY(fragment.x == 20); QVERIFY(fragment.y == 20); QVERIFY(fragment.sourceLeft == 30); |