diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-02-28 16:12:45 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-04 11:29:54 (GMT) |
| commit | 7b4e032559c7b226280e5c9229cd685e73d1e707 (patch) | |
| tree | 1edcb33e0002eab478bcf5c7e8d20abfd51b5e97 /src/gui | |
| parent | 2e80c16854c97aafff229828a5dbf4b0e31d245f (diff) | |
| download | Qt-7b4e032559c7b226280e5c9229cd685e73d1e707.zip Qt-7b4e032559c7b226280e5c9229cd685e73d1e707.tar.gz Qt-7b4e032559c7b226280e5c9229cd685e73d1e707.tar.bz2 | |
Added image conversion flag to prevent conversions.
This is needed in the meego graphics system to support the shared image
fallback path (when using the raster graphicssystem). The flag is
internal.
Reviewed-by: Gunnar Sletta
Diffstat (limited to 'src/gui')
| -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; |