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/gui/painting/qdrawutil.cpp | |
| 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/gui/painting/qdrawutil.cpp')
| -rw-r--r-- | src/gui/painting/qdrawutil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp index d76c709..a62f06b 100644 --- a/src/gui/painting/qdrawutil.cpp +++ b/src/gui/painting/qdrawutil.cpp @@ -1081,7 +1081,7 @@ void qDrawItem(QPainter *p, Qt::GUIStyle gs, according to the \a margins structure. */ -typedef QVarLengthArray<QPainter::Fragment, 16> QPixmapFragmentsArray; +typedef QVarLengthArray<QPainter::PixmapFragment, 16> QPixmapFragmentsArray; /*! \since 4.6 @@ -1102,7 +1102,7 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin const QPixmap &pixmap, const QRect &sourceRect,const QMargins &sourceMargins, const QTileRules &rules, QDrawBorderPixmap::DrawingHints hints) { - QPainter::Fragment d; + QPainter::PixmapFragment d; d.opacity = 1.0; d.rotation = 0.0; |