summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-04-01 13:43:57 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-04-28 14:40:59 (GMT)
commit20a0448cfe6e683e8bc66d3bd62a0981067602f9 (patch)
treecaece37e8771384907a355f031cb83c9d6ec0005
parent76d46a2deedc69108cefce811e8dc6a65f9151e6 (diff)
downloadQt-20a0448cfe6e683e8bc66d3bd62a0981067602f9.zip
Qt-20a0448cfe6e683e8bc66d3bd62a0981067602f9.tar.gz
Qt-20a0448cfe6e683e8bc66d3bd62a0981067602f9.tar.bz2
We previously had some hacks in this function to avoid creating a
backing store with the ARGB32 format (which is slower to draw on), but we actually want this in some cases so let's do this properly and move the hacks somewhere else.
-rw-r--r--src/gui/kernel/qt_s60_p.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 6261e4b..35755c3 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -227,12 +227,14 @@ static inline QImage::Format qt_TDisplayMode2Format(TDisplayMode mode)
format = QImage::Format_RGB666;
break;
case EColor16MU:
- case EColor16MA:
format = QImage::Format_RGB32;
break;
+ case EColor16MA:
+ format = QImage::Format_ARGB32;
+ break;
#ifdef __S60_50__
case EColor16MAP:
- format = QImage::Format_ARGB32;
+ format = QImage::Format_ARGB32_Premultiplied;
break;
#endif
default: