diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-03-30 08:28:42 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-03-30 08:28:42 (GMT) |
| commit | 571454cef27b8e377806ce25f457db0902e4b262 (patch) | |
| tree | 9688ea234b375549a60a4addabd90ede5e7ddc3a /src/opengl/qpaintengine_opengl.cpp | |
| parent | b3a2c210973a77d1517d017637a3d6ef849f4089 (diff) | |
| parent | 9748269cb58266fdfdac2c8820dad8c473dcf512 (diff) | |
| download | Qt-571454cef27b8e377806ce25f457db0902e4b262.zip Qt-571454cef27b8e377806ce25f457db0902e4b262.tar.gz Qt-571454cef27b8e377806ce25f457db0902e4b262.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/opengl/qpaintengine_opengl.cpp')
| -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; |