summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-12-05 15:06:42 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-05 15:08:25 +0100
commit097a3f42310dbef9a4051f83b2d3e8153f87b47b (patch)
tree03c53fbbb7e0fb81890dcff07989543e2972779b /src/gui
parent7beed8649357c6f19e0a84a46a4b47820314254a (diff)
qpixmap_win.cpp: Fix typo in format conversion (alpha).
Change-Id: I8abdae5482e94a7f9af494e5d547352431285336 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/image/qpixmap_win.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index 6b6dea782c..f46d503936 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -115,9 +115,9 @@ Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat =
}
// Copy over the data
- QImage::Format imageFormat = QImage::Format_ARGB32;
+ QImage::Format imageFormat = QImage::Format_RGB32;
if (hbitmapFormat == HBitmapAlpha)
- imageFormat = QImage::Format_RGB32;
+ imageFormat = QImage::Format_ARGB32;
else if (hbitmapFormat == HBitmapPremultipliedAlpha)
imageFormat = QImage::Format_ARGB32_Premultiplied;
const QImage image = rasterImage->convertToFormat(imageFormat);