diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-30 20:53:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-30 22:52:15 +0200 |
| commit | 4010cfbf2d91390f8cae1f6c5dbb352c1f5bf1d2 (patch) | |
| tree | 52b82cc7111af8769f30f0993d5fc3fc9c586de2 /src/gui/image/qpixmap_raster.cpp | |
| parent | d71f9d8c05d70053f2ce46dbb2203309addc0f93 (diff) | |
| parent | ea9003268556154fdc305aa745890fdea92ac46b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/image/qpixmap_raster.cpp')
| -rw-r--r-- | src/gui/image/qpixmap_raster.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index d879a5cb61..639650dd89 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -343,6 +343,7 @@ void QRasterPlatformPixmap::createPixmapForImage(QImage &sourceImage, Qt::ImageC if (format == QImage::Format_RGB32 && (sourceImage.format() == QImage::Format_ARGB32 || sourceImage.format() == QImage::Format_ARGB32_Premultiplied)) { + inPlace = inPlace && sourceImage.isDetached(); image = sourceImage; if (!inPlace) image.detach(); |