diff options
| author | Bill King <bking@trolltech.com> | 2010-01-12 02:45:42 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-01-12 02:45:42 (GMT) |
| commit | 7370dceadf969288a22c564728398cc7cb119d82 (patch) | |
| tree | ad966ec292aa7dbf98bdff4289603082478579b0 /src/opengl/qpaintengine_opengl.cpp | |
| parent | 82e9af930bea96710d7df87f03d3f4f1a175dbd3 (diff) | |
| parent | 7abb2cfdea14fa71aabcd79635aa8f407ed96186 (diff) | |
| download | Qt-7370dceadf969288a22c564728398cc7cb119d82.zip Qt-7370dceadf969288a22c564728398cc7cb119d82.tar.gz Qt-7370dceadf969288a22c564728398cc7cb119d82.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/opengl/qpaintengine_opengl.cpp')
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 8dae02a..d20f96c 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -4931,7 +4931,8 @@ void QOpenGLPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY); - bool antialias = !(ti.fontEngine->fontDef.styleStrategy & QFont::NoAntialias); + bool antialias = !(ti.fontEngine->fontDef.styleStrategy & QFont::NoAntialias) + && (d->matrix.type() > QTransform::TxTranslate); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, antialias ? GL_LINEAR : GL_NEAREST); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, antialias ? GL_LINEAR : GL_NEAREST); |