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 /src/openvg/qpaintengine_vg_p.h | |
| 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 'src/openvg/qpaintengine_vg_p.h')
| -rw-r--r-- | src/openvg/qpaintengine_vg_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/openvg/qpaintengine_vg_p.h b/src/openvg/qpaintengine_vg_p.h index 1203af5..1e7e26c 100644 --- a/src/openvg/qpaintengine_vg_p.h +++ b/src/openvg/qpaintengine_vg_p.h @@ -137,7 +137,8 @@ public: void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s); - void drawPixmapFragments(const QPainter::Fragment *drawingData, int dataCount, const QPixmap &pixmap, QFlags<QPainter::FragmentHint> hints); + void drawPixmapFragments(const QPainter::PixmapFragment *drawingData, int dataCount, const QPixmap &pixmap, + QFlags<QPainter::PixmapFragmentHint> hints); void drawTextItem(const QPointF &p, const QTextItem &textItem); void drawStaticTextItem(QStaticTextItem *staticTextItem); |