diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-18 15:53:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-18 15:53:04 (GMT) |
| commit | 06d60696fcc88f058b53d08785cc01a580dfb4ed (patch) | |
| tree | de9bc473225b58ab413d9002b4ad811ddf742673 /src/opengl/qgl_p.h | |
| parent | 4082e4711a1c54947429b15504caf778c6da22d0 (diff) | |
| parent | 9f18a1ad5ce32dd397642a4c03fa1fcb21fb9456 (diff) | |
| download | Qt-06d60696fcc88f058b53d08785cc01a580dfb4ed.zip Qt-06d60696fcc88f058b53d08785cc01a580dfb4ed.tar.gz Qt-06d60696fcc88f058b53d08785cc01a580dfb4ed.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Check correctly before including SSE4.2 header.
Fixed crash when destroying QGLWidget
Prevent crash in GL 2 engine when stroking null rectangle.
Compile fix.
Documentation update for new switching events.
Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
Doc: Fixing typo
Fix possible missing glyphs in text when using GL engine
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 4742bdb..b46d428 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -506,7 +506,8 @@ private slots: // when you come to delete the context. QGLContextPrivate::unbindPixmapFromTexture(boundPixmap); glDeleteTextures(1, &id); - oldContext->makeCurrent(); + if (oldContext) + oldContext->makeCurrent(); return; } #endif |