diff options
author | David Boddie <dboddie@trolltech.com> | 2010-01-07 14:45:56 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-01-07 14:45:56 (GMT) |
commit | ce5f772c529517c3e1c043fd826a790316ed9915 (patch) | |
tree | 159d306fedb648d659ecd6bc90c93225d1d2e6e1 /src/gui/image/qpixmap_x11.cpp | |
parent | a628b5579a977594cf125110589c8bd5096db380 (diff) | |
parent | 55c983e33d974d046d8deab8b68b85efdb9eb03a (diff) | |
download | Qt-ce5f772c529517c3e1c043fd826a790316ed9915.zip Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.gz Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/image/qpixmap_x11.cpp')
-rw-r--r-- | src/gui/image/qpixmap_x11.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp index 7008fbd..0e66e09 100644 --- a/src/gui/image/qpixmap_x11.cpp +++ b/src/gui/image/qpixmap_x11.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -1932,6 +1932,8 @@ QPixmap QX11PixmapData::transformed(const QTransform &transform, x11Data->hd = (Qt::HANDLE)XCreatePixmap(X11->display, RootWindow(X11->display, xinfo.screen()), w, h, d); + x11Data->setSerialNumber(++qt_pixmap_serial); + #ifndef QT_NO_XRENDER if (X11->use_xrender) { XRenderPictFormat *format = x11Data->d == 32 |