diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-03-10 09:05:53 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-03-10 09:05:53 (GMT) |
| commit | a0ec41037fcbb686dfc5c4679261bffc5e358fdd (patch) | |
| tree | fda0f01c3aebbfe6f4ab32c76f92702e537a5bca /src/declarative | |
| parent | 3a1e96fc9d5844583138d183e95e127a034daf56 (diff) | |
| parent | 12d63b05a942281e688d857d17c190564c77b698 (diff) | |
| download | Qt-a0ec41037fcbb686dfc5c4679261bffc5e358fdd.zip Qt-a0ec41037fcbb686dfc5c4679261bffc5e358fdd.tar.gz Qt-a0ec41037fcbb686dfc5c4679261bffc5e358fdd.tar.bz2 | |
Merge remote branch 'origin/4.7-cutoff' into 4.7
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 |