summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-08 03:07:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-08 03:07:19 (GMT)
commita92fb867b255e1baa6124d20a4eb6e3fd54ddf7e (patch)
treee67246d5f8d459a547152390660c560bf25660ae /doc/src/snippets/code
parent06da806717763dd41904658285d82ac5664bbc6b (diff)
parent6968b3fe1354c289767b2b21bc723bb5fd1576ae (diff)
downloadQt-a92fb867b255e1baa6124d20a4eb6e3fd54ddf7e.zip
Qt-a92fb867b255e1baa6124d20a4eb6e3fd54ddf7e.tar.gz
Qt-a92fb867b255e1baa6124d20a4eb6e3fd54ddf7e.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT Add GL_EXT_texture_format_BGRA8888 support. Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916 Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem" Correction for effectiveBoundingRect() calculation for QGraphicsItem
Diffstat (limited to 'doc/src/snippets/code')
0 files changed, 0 insertions, 0 deletions