diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
| commit | 3fb36b36de90068db241cc21184a8ac3b899ad2d (patch) | |
| tree | 22490e313f1415681ddfb35f1b0ea0dca8f94ac6 /src/gui/image/qpixmapdata.cpp | |
| parent | d11e3d6e327677e828918de3173732116976fbe4 (diff) | |
| parent | f34f4ea2d35b92631e98a772e02a1b77ce26681e (diff) | |
| download | Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.zip Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.gz Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/image/qpixmapdata.cpp')
| -rw-r--r-- | src/gui/image/qpixmapdata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmapdata.cpp b/src/gui/image/qpixmapdata.cpp index ea4fe6b..31ca909 100644 --- a/src/gui/image/qpixmapdata.cpp +++ b/src/gui/image/qpixmapdata.cpp @@ -146,7 +146,7 @@ bool QPixmapData::fromData(const uchar *buf, uint len, const char *format, Qt::I void QPixmapData::copy(const QPixmapData *data, const QRect &rect) { - fromImage(data->toImage().copy(rect), Qt::AutoColor); + fromImage(data->toImage().copy(rect), Qt::NoOpaqueDetection); } bool QPixmapData::scroll(int dx, int dy, const QRect &rect) |