diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
| commit | ea9003268556154fdc305aa745890fdea92ac46b (patch) | |
| tree | a3ed6fc20fe4be0d7d07f752942cd5b7e2e3c7de /src/gui/image | |
| parent | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (diff) | |
| parent | 7e74f8f398deb8ed84f6c4613de6dab2066dc9de (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/network/ssl/qsslsocket_openssl_symbols.cpp
Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
Diffstat (limited to 'src/gui/image')
| -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(); |