diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-17 06:17:55 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-17 06:17:55 (GMT) |
commit | 7d6af0213ab4f8797f98d0beb659fcf2f78a361b (patch) | |
tree | f7e66a06bc6374ae52d793014f9f3729ef60a7a1 /src/corelib/io/qtextstream.cpp | |
parent | 608daaa6b0701cae456e1959614e70f4bd1419a2 (diff) | |
parent | cc5ae2db39bd5cb5e7710b1b7ce1b5c92b705450 (diff) | |
download | Qt-7d6af0213ab4f8797f98d0beb659fcf2f78a361b.zip Qt-7d6af0213ab4f8797f98d0beb659fcf2f78a361b.tar.gz Qt-7d6af0213ab4f8797f98d0beb659fcf2f78a361b.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:
Update FBO docs to describe how QPainter changes the GL state
(OCI) Fixes problem with clobs being handled as binary
Disable depth testing during the 2D QGLWidget::renderText()
Diffstat (limited to 'src/corelib/io/qtextstream.cpp')
0 files changed, 0 insertions, 0 deletions