summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-09-10 06:31:27 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-09-10 06:31:27 (GMT)
commit9984c26d98a3ef704e7a4a2ed073a36b41050294 (patch)
tree29c39fdbb34950b6f29a008497202d15d33eab17 /src
parentcea0b5db7f16177882bbfbbe7b4f92307b045bf7 (diff)
parent5f24d8930838f0d3cb622f9937a171eb6734df1a (diff)
downloadQt-9984c26d98a3ef704e7a4a2ed073a36b41050294.zip
Qt-9984c26d98a3ef704e7a4a2ed073a36b41050294.tar.gz
Qt-9984c26d98a3ef704e7a4a2ed073a36b41050294.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
-rw-r--r--src/opengl/qgl.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 3e30fe4..65d6f99 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -4916,8 +4916,13 @@ QGLContextResource::QGLContextResource(FreeFunc f, QObject *parent)
QGLContextResource::~QGLContextResource()
{
- while (!m_resources.empty())
- removeGroup(m_resources.begin().key());
+#ifndef QT_NO_DEBUG
+ if (m_resources.size()) {
+ qWarning("QtOpenGL: Resources are still available at program shutdown.\n"
+ " This is possibly caused by a leaked QGLWidget, \n"
+ " QGLFrameBufferObject or QGLPixelBuffer.");
+ }
+#endif
}
void QGLContextResource::insert(const QGLContext *key, void *value)