diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2010-03-04 11:06:19 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2010-03-04 11:09:47 (GMT) |
| commit | a9bf9766f18e15fbecf53ac1cc9cf57c9dba259c (patch) | |
| tree | cd6b7c430b7cc1b7a50a82515414ee1c2e51dfb0 /src/opengl | |
| parent | 2aaf4d1a35792ba7d0d0f217dbda1c1297389f3e (diff) | |
| download | Qt-a9bf9766f18e15fbecf53ac1cc9cf57c9dba259c.zip Qt-a9bf9766f18e15fbecf53ac1cc9cf57c9dba259c.tar.gz Qt-a9bf9766f18e15fbecf53ac1cc9cf57c9dba259c.tar.bz2 | |
Fixed an exit crash that could occur in the GL 2 engine under X11.
The global destructor for the clean up hooks might be called before the
global destructor for QPixmap objects. We shouldn't leave pixmaps
around that is destroyed after the QApplication destructor is called.
Task-number: QTBUG-8681
Reviewed-by: Tom Cooksey
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index c08d04a..2b8e097 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -1597,6 +1597,7 @@ bool QGL2PaintEngineEx::end() delete d->shaderManager; d->shaderManager = 0; + d->currentBrush = QBrush(); #ifdef QT_OPENGL_CACHE_AS_VBOS if (!d->unusedVBOSToClean.isEmpty()) { |