summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-04 13:04:25 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-04 13:04:25 (GMT)
commit1e50b6abb78ce92241270474fa5b0cc4e568dc18 (patch)
tree4458e514e04a9701be2a0d24240be39c728c3af0 /src/corelib
parent79829b9871574c65c15bf0b6553a500dcff8d6b7 (diff)
parent41b014093f2ad85b4ecee768da1e1cb9636d4366 (diff)
downloadQt-1e50b6abb78ce92241270474fa5b0cc4e568dc18.zip
Qt-1e50b6abb78ce92241270474fa5b0cc4e568dc18.tar.gz
Qt-1e50b6abb78ce92241270474fa5b0cc4e568dc18.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT Add GL_EXT_texture_format_BGRA8888 support. Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem" Correction for effectiveBoundingRect() calculation for QGraphicsItem
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions