diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
| commit | 7075e291998612a3c0a530bb37a515dd07739e28 (patch) | |
| tree | 4e1992498d82ee3f6f92fd6d42754c92928dd581 /src/gui/opengl | |
| parent | 1161a8a62907796ea45b1877bec31e66aeef77f6 (diff) | |
| parent | 3d9a40038f01bc2a3df0027a9be04e7fa3ce3850 (diff) | |
| download | qtbase-7075e291998612a3c0a530bb37a515dd07739e28.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/widgets/styles/qstyleanimation.cpp
Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopenglpaintengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp index 6238564eeb..2a8902adbf 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp @@ -877,7 +877,7 @@ void QOpenGL2PaintEngineExPrivate::fill(const QVectorPath& path) // Tag it for later so that if the same path is drawn twice, it is assumed to be static and thus cachable path.makeCacheable(); - if (device->context()->format().stencilBufferSize() == 0) { + if (device->context()->format().stencilBufferSize() <= 0) { // If there is no stencil buffer, triangulate the path instead. QRectF bbox = path.controlPointRect(); |