diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 05:24:31 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 05:24:31 (GMT) |
commit | 211d51adae4d3914544c6b3f82caf66a99af03ec (patch) | |
tree | c1e95885f44e663be9a1fbb7817eb6e5019ba7b7 /src/corelib | |
parent | 0113820e977044b12ee53d773bb6b00e76dd8eff (diff) | |
parent | 443046294bd87661b5970e5b16bc28ac99b77059 (diff) | |
download | Qt-211d51adae4d3914544c6b3f82caf66a99af03ec.zip Qt-211d51adae4d3914544c6b3f82caf66a99af03ec.tar.gz Qt-211d51adae4d3914544c6b3f82caf66a99af03ec.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Enablers for external use of QGLTextureGlyphCache
Fix painting of overlines in labels.
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions