summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-09 18:43:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-09 18:43:14 (GMT)
commit587f4325850615392e99881e060121bd5ea85360 (patch)
treec563522a355de79e857287a71a00115213262b81 /src/gui/image
parent690e54dda08496d80526ae64dcb1fb88f533542b (diff)
parent385f2c8a34a52443e78dfa272a1a483b9d6d29fc (diff)
downloadQt-587f4325850615392e99881e060121bd5ea85360.zip
Qt-587f4325850615392e99881e060121bd5ea85360.tar.gz
Qt-587f4325850615392e99881e060121bd5ea85360.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enable preserved swap behavior when surface is created due to resize. Generate triggered signal even the action launches menu in Symbian. Symbian emulator: unload file server so apps can be recompiled. Clear QFontCache TLS content before nullifying TLS pointer. Fixed focus and window activation events on Symbian when opening menu. QTBUG-4887 and other exception safety fixes
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qimage.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 4f5efa1..5d2b4c0 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -5667,7 +5667,11 @@ void QImage::setAlphaChannel(const QImage &alphaChannel)
detach();
- *this = convertToFormat(QImage::Format_ARGB32_Premultiplied);
+ QImage converted = convertToFormat(QImage::Format_ARGB32_Premultiplied);
+ if (!converted.isNull())
+ *this = converted;
+ else
+ return;
// Slight optimization since alphachannels are returned as 8-bit grays.
if (alphaChannel.d->depth == 8 && alphaChannel.isGrayscale()) {