diff options
author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-01-29 10:39:06 (GMT) |
---|---|---|
committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-01-29 14:29:42 (GMT) |
commit | 9e95ce2a68ef167e17dccc5789cbf3bf74712280 (patch) | |
tree | 1fc5e33c239a32905dfd6692292e363d6783b88e /tests/auto/qgl/qgl.pro | |
parent | e2f9547983c15be88c0a096dd52cc7c7a0eac0c6 (diff) | |
download | Qt-9e95ce2a68ef167e17dccc5789cbf3bf74712280.zip Qt-9e95ce2a68ef167e17dccc5789cbf3bf74712280.tar.gz Qt-9e95ce2a68ef167e17dccc5789cbf3bf74712280.tar.bz2 |
Fix GL texture leaks when pixmaps are deleted
This fixes quite a lot of issues:
* QtOpenGL only registered qpixmap destruction hooks on X11 and
those only cleanup the EGL/GLX surface, not the texture object.
* The QPixmap destruction hooks were only being called from the
QPixmap destructor. However, this means when a QPixmap is assigned
to another QPixmap, the hooks don't get called.
Task-number: QTBUG-7647
Reviewed-By: Samuel
Reviewed-By: Trond
Diffstat (limited to 'tests/auto/qgl/qgl.pro')
-rw-r--r-- | tests/auto/qgl/qgl.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro index 420c4bb..9116f39 100644 --- a/tests/auto/qgl/qgl.pro +++ b/tests/auto/qgl/qgl.pro @@ -6,6 +6,6 @@ load(qttest_p4) requires(contains(QT_CONFIG,opengl)) QT += opengl -SOURCES += tst_qgl.cpp - +SOURCES += tst_qgl.cpp +RESOURCES = qgl.qrc |