diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 12:30:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 12:30:14 (GMT) |
| commit | 57530dab8043c67b1356fb764fc83f6ef00dfdc1 (patch) | |
| tree | 7f64e6484b412b7b8bfae5cd3fa574e381aec652 /src/gui/image | |
| parent | fe6748f91f94746f2f81b448df7c094b306c865d (diff) | |
| parent | 7b4e032559c7b226280e5c9229cd685e73d1e707 (diff) | |
| download | Qt-57530dab8043c67b1356fb764fc83f6ef00dfdc1.zip Qt-57530dab8043c67b1356fb764fc83f6ef00dfdc1.tar.gz Qt-57530dab8043c67b1356fb764fc83f6ef00dfdc1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Added image conversion flag to prevent conversions.
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmap_raster.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 368600f..5e0ffa8 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -380,6 +380,9 @@ int QRasterPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const void QRasterPixmapData::createPixmapForImage(QImage &sourceImage, Qt::ImageConversionFlags flags, bool inPlace) { QImage::Format format; + if (flags & Qt::NoFormatConversion) + format = sourceImage.format(); + else #ifdef Q_WS_QWS if (pixelType() == BitmapType) { format = QImage::Format_Mono; |