diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-11-23 10:34:04 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-11-23 10:34:04 (GMT) |
| commit | 88f1ac8054146e6fd89370c5d24b0c84884ccfc9 (patch) | |
| tree | 7b9aa1b10baf4595836b3efc023a979365643c30 /src/openvg | |
| parent | b5e5d6b39c01c4a3962d07d79c025c16aa1c24a5 (diff) | |
| parent | f9c97d3a4ab7bbd0ca2f4cf33a53025af23fc47c (diff) | |
| download | Qt-88f1ac8054146e6fd89370c5d24b0c84884ccfc9.zip Qt-88f1ac8054146e6fd89370c5d24b0c84884ccfc9.tar.gz Qt-88f1ac8054146e6fd89370c5d24b0c84884ccfc9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/openvg')
| -rw-r--r-- | src/openvg/qpixmapdata_vg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp index 509882b..c3c7def 100644 --- a/src/openvg/qpixmapdata_vg.cpp +++ b/src/openvg/qpixmapdata_vg.cpp @@ -214,7 +214,7 @@ void QVGPixmapData::createPixmapForImage(QImage &image, Qt::ImageConversionFlags else if (!(flags & Qt::NoOpaqueDetection) && const_cast<QImage &>(image).data_ptr()->checkForAlphaPixels()) format = sourceFormat(); else - format = QImage::Format_RGB32; + format = image.hasAlphaChannel() ? sourceFormat() : QImage::Format_RGB32; if (inPlace && image.data_ptr()->convertInPlace(format, flags)) source = image; |