diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 09:20:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 09:20:17 (GMT) |
| commit | fae9fe6326f18faf8531707b37aa349dca3586b2 (patch) | |
| tree | 6edd28191528d4b7caf92ab3ba2f1c381ec84870 /src/opengl | |
| parent | 64a360f45ab9a1c50ca628cfd6b670b93816c756 (diff) | |
| parent | a6e182f7a91b2dd9371e7b16f2553430cbae4509 (diff) | |
| download | Qt-fae9fe6326f18faf8531707b37aa349dca3586b2.zip Qt-fae9fe6326f18faf8531707b37aa349dca3586b2.tar.gz Qt-fae9fe6326f18faf8531707b37aa349dca3586b2.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:
Fixed caching of QPainter patterns in the GL 2 engine.
Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget
QTableView: fix spans corruption when removing spans.
Fixes painting artifacts when scaling a QGraphicsProxyWidget.
Fix <MemLeak> valgrind report shows memory leak for QImage::save().
Fix test sql for sql server.
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 2b8e097..828849d 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -184,7 +184,7 @@ void QGL2PaintEngineExPrivate::updateBrushTexture() QImage texImage = qt_imageForBrush(style, false); glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT); - ctx->d_func()->bindTexture(texImage, GL_TEXTURE_2D, GL_RGBA, true, QGLContext::InternalBindOption); + ctx->d_func()->bindTexture(texImage, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption); updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, q->state()->renderHints & QPainter::SmoothPixmapTransform); } else if (style >= Qt::LinearGradientPattern && style <= Qt::ConicalGradientPattern) { |