diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-03-27 15:53:22 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-03-27 16:03:01 (GMT) |
| commit | 136f9766f6629a3e82609cf51346e4811bcc47ae (patch) | |
| tree | e6442b7a7dc25f67cdf4401e8071b6096b6cae45 /src | |
| parent | c9db617cc2962ffbf76e6e6eb60a0c8a14843e52 (diff) | |
| download | Qt-136f9766f6629a3e82609cf51346e4811bcc47ae.zip Qt-136f9766f6629a3e82609cf51346e4811bcc47ae.tar.gz Qt-136f9766f6629a3e82609cf51346e4811bcc47ae.tar.bz2 | |
Crash in OpenGL paint engine when brush style is Qt::NoBrush.
Check for Qt::NoBrush and return early in the composite() function.
Task-number: 249628
Reviewed-by: Trond
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index f332a50..976a021 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -5328,6 +5328,9 @@ void QOpenGLPaintEnginePrivate::composite(GLuint primitive, const q_vertexType * Q_Q(QOpenGLPaintEngine); QGL_FUNC_CONTEXT; + if (current_style == Qt::NoBrush) + return; + DEBUG_ONCE qDebug() << "QOpenGLPaintEnginePrivate: Using compositing program: fragment_brush =" << fragment_brush << ", fragment_composition_mode =" << fragment_composition_mode; |