diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-07-28 09:35:59 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-07-29 10:06:29 (GMT) |
| commit | 78f079016e0dd9b455d74c6a84cfbdb859fd1094 (patch) | |
| tree | e22747d39cbcafc908df1427445c2e4633e35f75 /src/gui/image/qpixmap.cpp | |
| parent | f4978a5894212dd655a91dbb0db02a89070bb165 (diff) | |
| download | Qt-78f079016e0dd9b455d74c6a84cfbdb859fd1094.zip Qt-78f079016e0dd9b455d74c6a84cfbdb859fd1094.tar.gz Qt-78f079016e0dd9b455d74c6a84cfbdb859fd1094.tar.bz2 | |
Move uninit & readonly into a flags member of QX11PixmapData
Also add 2 new flags and a new member to store any GL bound pixmap
surface (GLXPixmap or EGLPixmapSurface).
Reviewed-By: Samuel
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 2674cac..82835d5 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -649,7 +649,7 @@ void QPixmap::resize_helper(const QSize &s) QX11PixmapData *x11Data = data->classId() == QPixmapData::X11Class ? static_cast<QX11PixmapData*>(data) : 0; if (x11Data) { pm.x11SetScreen(x11Data->xinfo.screen()); - uninit = x11Data->uninit; + uninit = x11Data->flags & QX11PixmapData::Uninitialized; } #elif defined(Q_WS_MAC) QMacPixmapData *macData = data->classId() == QPixmapData::MacClass ? static_cast<QMacPixmapData*>(data) : 0; @@ -1936,7 +1936,7 @@ void QPixmap::detach() #if defined(Q_WS_X11) if (data->classId() == QPixmapData::X11Class) { QX11PixmapData *d = static_cast<QX11PixmapData*>(data); - d->uninit = false; + d->flags &= ~QX11PixmapData::Uninitialized; // reset the cache data if (d->hd2) { |