diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-07-30 12:25:41 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-07-30 12:25:41 (GMT) |
| commit | 2fb1b5378e551a42554b42c028226e65b3b41593 (patch) | |
| tree | 48359652b4b09cdc37a91297489fd7e6985c27a9 /src/gui/painting/qwindowsurface_x11.cpp | |
| parent | 26e9f4e077c49d1191835def595e4fb70ee50be2 (diff) | |
| parent | 66a3c503e8e99b8cd28c2fef2b0a869f27c7efe7 (diff) | |
| download | Qt-2fb1b5378e551a42554b42c028226e65b3b41593.zip Qt-2fb1b5378e551a42554b42c028226e65b3b41593.tar.gz Qt-2fb1b5378e551a42554b42c028226e65b3b41593.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/painting/qwindowsurface_x11.cpp')
| -rw-r--r-- | src/gui/painting/qwindowsurface_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qwindowsurface_x11.cpp b/src/gui/painting/qwindowsurface_x11.cpp index d8b0d9e..95f6ce3 100644 --- a/src/gui/painting/qwindowsurface_x11.cpp +++ b/src/gui/painting/qwindowsurface_x11.cpp @@ -154,7 +154,7 @@ void QX11WindowSurface::setGeometry(const QRect &rect) QX11PixmapData *oldData = static_cast<QX11PixmapData *>(d_ptr->device.pixmapData()); Q_ASSERT(oldData); - if (!oldData->uninit && hasStaticContents()) { + if (!(oldData->flags & QX11PixmapData::Uninitialized) && hasStaticContents()) { // Copy the content of the old pixmap into the new one. QX11PixmapData *newData = new QX11PixmapData(QPixmapData::PixmapType); newData->resize(size.width(), size.height()); @@ -175,7 +175,7 @@ void QX11WindowSurface::setGeometry(const QRect &rect) dx, dy, qMin(boundingRect.width(), size.width()), qMin(boundingRect.height(), size.height()), dx, dy); XFreeGC(X11->display, tmpGc); - newData->uninit = false; + newData->flags &= ~QX11PixmapData::Uninitialized; d_ptr->device = QPixmap(newData); } else { |