diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-27 11:08:37 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-27 11:08:37 (GMT) |
| commit | 809fb65022a5c7ef09803478d637c33534dc1b80 (patch) | |
| tree | a4ae6b727c642114f21303489797bd48b52a7f1f /src/opengl | |
| parent | 8b2a5214a46fa15b0394ee3c8147343fc79e44d4 (diff) | |
| parent | fdd29c588801b0c50a8d85c43c7754bc6e988883 (diff) | |
| download | Qt-809fb65022a5c7ef09803478d637c33534dc1b80.zip Qt-809fb65022a5c7ef09803478d637c33534dc1b80.tar.gz Qt-809fb65022a5c7ef09803478d637c33534dc1b80.tar.bz2 | |
Merge branch 'vectorpath' into 4.6
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index a0810bc..b70810d 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -858,9 +858,7 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path) QGLRect rect(points[0].x(), points[0].y(), points[2].x(), points[2].y()); prepareForDraw(currentBrush->isOpaque()); composite(rect); - } else if (path.shape() == QVectorPath::EllipseHint - || path.shape() == QVectorPath::ConvexPolygonHint) - { + } else if (path.isConvex()) { vertexCoordinateArray.clear(); vertexCoordinateArray.addPath(path, inverseScale, false); prepareForDraw(currentBrush->isOpaque()); |