summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/md5
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-10 16:29:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-10 16:29:19 (GMT)
commit1f433202e13e2cde0f02a2196d9ff8c6712f86ed (patch)
tree170324ed93ccec09c826c788a61d26d5e10b76c5 /src/3rdparty/md5
parent6da5d0be4d98c0cb47352cd79a86b729d6e77ffc (diff)
parent4a1e5fce254a3ef32f59c67f22ba621ebb84ccc5 (diff)
downloadQt-1f433202e13e2cde0f02a2196d9ff8c6712f86ed.zip
Qt-1f433202e13e2cde0f02a2196d9ff8c6712f86ed.tar.gz
Qt-1f433202e13e2cde0f02a2196d9ff8c6712f86ed.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: Fix for loading QPixmaps from file in GL graphics system Fix code style in qgl_symbian.cpp QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. Use the 'convertInPlace' versions of QImage in QGLPixmapData load. Recreate GL surface when native window is resized on Symbian
Diffstat (limited to 'src/3rdparty/md5')
0 files changed, 0 insertions, 0 deletions