diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-01 20:08:52 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-01 20:08:52 (GMT) |
commit | 0a2c68820b1c36cae27d24e009f676f175f985b7 (patch) | |
tree | 3b865e95f12748266165fcae4fe5a7882f693d10 /src/openvg | |
parent | 33a23c485fb11cad5442966faf02672b2411ff29 (diff) | |
parent | cd63a4c50ecfca56bb7685fc40b084f830156c02 (diff) | |
download | Qt-0a2c68820b1c36cae27d24e009f676f175f985b7.zip Qt-0a2c68820b1c36cae27d24e009f676f175f985b7.tar.gz Qt-0a2c68820b1c36cae27d24e009f676f175f985b7.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix configure's error message to report correct OpenGL qmake vars
Fix background brush for character format when writing to ODF document.
Also delete blitShader & simpleShader in ~QGLEngineSharedShaders
fix a memory leak in QGLEngineSharedShaders
Fixed QGLWidget::renderText().
Fixes painting artifacts when using CacheBackground in a QGraphicsView.
Remove superfluous enable/disable vertex arrtib arrays
Track which vertex attrib arrays are enabled in QGLContextPrivate
Diffstat (limited to 'src/openvg')
0 files changed, 0 insertions, 0 deletions