summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap_x11.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-07 13:42:13 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-07 13:45:45 +0200
commite82d6264571604357b28ccb8d1b079c7eaf6ba71 (patch)
tree143c92ada3e00fd4e8534b999302af0de0de1c78 /src/gui/image/qpixmap_x11.cpp
parent91fa2c1beb79124db4a70a37e2224c1de9b9ded4 (diff)
remove somewhat misleading warning about x11 pixmap leak
the only situation where it would be actually true are broken drivers (or a broken x server as a whole). qt is not the right place to worry about that problem. Reviewed-by: jbache
Diffstat (limited to 'src/gui/image/qpixmap_x11.cpp')
-rw-r--r--src/gui/image/qpixmap_x11.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
index 6bebefc0fa..e8dc5aeae0 100644
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
@@ -1250,10 +1250,8 @@ void QX11PixmapData::release()
pengine = 0;
if (!X11) {
-#ifndef QT_NO_DEBUG
- qWarning("~QX11PixmapData(): QPixmap objects must be destroyed before the QApplication"
- " object, otherwise the native pixmap object will be leaked.");
-#endif
+ // At this point, the X server will already have freed our resources,
+ // so there is nothing to do.
return;
}