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/declarative | |
| 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/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeparticles.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeparticles.cpp b/src/declarative/graphicsitems/qdeclarativeparticles.cpp index ec0bf6c..593c80a 100644 --- a/src/declarative/graphicsitems/qdeclarativeparticles.cpp +++ b/src/declarative/graphicsitems/qdeclarativeparticles.cpp @@ -1263,7 +1263,7 @@ void QDeclarativeParticlesPainter::paint(QPainter *p, const QStyleOptionGraphics const int myY = y() + parentItem()->y(); #if (QT_VERSION >= QT_VERSION_CHECK(4,7,0)) - QVarLengthArray<QPainter::Fragment, 256> pixmapData; + QVarLengthArray<QPainter::PixmapFragment, 256> pixmapData; #else QVarLengthArray<QDrawPixmaps::Data, 256> pixmapData; #endif |