summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_p.h
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2010-06-15 12:02:32 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2010-06-15 12:02:32 (GMT)
commitac3c3b3a19207328ffbcbdada10ef61291caba15 (patch)
treea33f216d62aa506448f7fb6cbdf7640f5f223fe0 /src/opengl/qgl_p.h
parentc5b06919a8fb5d20aae41f0edf9e2ffa99eb1a8a (diff)
parenta041e4eca3467c1baa6245b6fb47def127f30f41 (diff)
downloadQt-ac3c3b3a19207328ffbcbdada10ef61291caba15.zip
Qt-ac3c3b3a19207328ffbcbdada10ef61291caba15.tar.gz
Qt-ac3c3b3a19207328ffbcbdada10ef61291caba15.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/opengl/qgl_p.h')
-rw-r--r--src/opengl/qgl_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 16c225f..1727a41 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -177,6 +177,10 @@ public:
void initContext(QGLContext *context, const QGLWidget* shareWidget);
bool renderCxPm(QPixmap *pixmap);
void cleanupColormaps();
+ void aboutToDestroy() {
+ if (glcx)
+ glcx->reset();
+ }
QGLContext *glcx;
QGLWidgetGLPaintDevice glDevice;