diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
| commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
| tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/gui/image/qplatformpixmap.cpp | |
| parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
| parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'src/gui/image/qplatformpixmap.cpp')
| -rw-r--r-- | src/gui/image/qplatformpixmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp index 1f40102cf0..54f0087bc2 100644 --- a/src/gui/image/qplatformpixmap.cpp +++ b/src/gui/image/qplatformpixmap.cpp @@ -83,7 +83,7 @@ QPlatformPixmap::QPlatformPixmap(PixelType pixelType, int objectId) QPlatformPixmap::~QPlatformPixmap() { // Sometimes the pixmap cleanup hooks will be called from derrived classes, which will - // then set is_cached to false. For example, on X11 QtGui needs to delete the GLXPixmap + // then set is_cached to false. For example, on X11 Qt GUI needs to delete the GLXPixmap // or EGL Pixmap Surface for a given pixmap _before_ the native X11 pixmap is deleted, // otherwise some drivers will leak the GL surface. In this case, QX11PlatformPixmap will // call the cleanup hooks itself before deleting the native pixmap and set is_cached to |