diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 11:15:38 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 11:15:38 (GMT) |
| commit | a44892b71d1b08cdd03c990dff50d8138bd4457c (patch) | |
| tree | 6c47dbb2f37b8653a50d942181d1aab85228ee30 /src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | |
| parent | 827123e43be5bf83db160549ce9dfe33913f8416 (diff) | |
| parent | e85b166bc22e3b0daa6a8df029ab6e31dac2447f (diff) | |
| download | Qt-a44892b71d1b08cdd03c990dff50d8138bd4457c.zip Qt-a44892b71d1b08cdd03c990dff50d8138bd4457c.tar.gz Qt-a44892b71d1b08cdd03c990dff50d8138bd4457c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index bc4b103..895dd65 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -1184,9 +1184,11 @@ void QGL2PaintEngineEx::drawTexture(const QRectF &dest, GLuint textureId, const glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT); glBindTexture(GL_TEXTURE_2D, textureId); + QGLRect srcRect(src.left(), src.bottom(), src.right(), src.top()); + d->updateTextureFilter(GL_TEXTURE_2D, GL_CLAMP_TO_EDGE, state()->renderHints & QPainter::SmoothPixmapTransform, textureId); - d->drawTexture(dest, src, size, false); + d->drawTexture(dest, srcRect, size, false); } void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem) |