diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-01-29 11:39:06 +0100 |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-01-29 15:29:42 +0100 |
| commit | 9e95ce2a68ef167e17dccc5789cbf3bf74712280 (patch) | |
| tree | 1fc5e33c239a32905dfd6692292e363d6783b88e /tests/auto/qgl/qgl.qrc | |
| parent | e2f9547983c15be88c0a096dd52cc7c7a0eac0c6 (diff) | |
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.qrc')
| -rw-r--r-- | tests/auto/qgl/qgl.qrc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qgl/qgl.qrc b/tests/auto/qgl/qgl.qrc new file mode 100644 index 0000000000..653794a166 --- /dev/null +++ b/tests/auto/qgl/qgl.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file alias="designer.png">../qpixmap/images/designer.png</file> +</qresource> +</RCC> |