summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglpixmapfilter_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-28 03:31:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-28 03:31:13 (GMT)
commit4d848478706e1a32eb0d85e222ba029f68a768d7 (patch)
tree7613e04aff89594f1e9623ff855c516f42f6ab3e /src/opengl/qglpixmapfilter_p.h
parentd134df1ffd8b4361645e6dc8354551a6c3f32891 (diff)
parent73210ed3c77e4f1a7f30cd3e7763b75970b32b53 (diff)
downloadQt-4d848478706e1a32eb0d85e222ba029f68a768d7.zip
Qt-4d848478706e1a32eb0d85e222ba029f68a768d7.tar.gz
Qt-4d848478706e1a32eb0d85e222ba029f68a768d7.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: Wrong QGraphicsItem::childrenBoundingRect() when applying effects. Fix a bug in QDirectFBPixmapData::fromImage Replace memmove with memcpy Fixed compilation of QtOpenGL. Optimize initialization of QStaticText
Diffstat (limited to 'src/opengl/qglpixmapfilter_p.h')
0 files changed, 0 insertions, 0 deletions