diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 11:09:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 11:09:42 (GMT) |
| commit | 274fbf5c1847ffbee9967064068ee8e23b141198 (patch) | |
| tree | eda9f5fd49da728907c10e16a6c0af837fd7c9c5 /src/gui/image | |
| parent | 64a360f45ab9a1c50ca628cfd6b670b93816c756 (diff) | |
| parent | e86eabc78e222d9c46a38940085025dea518aefa (diff) | |
| download | Qt-274fbf5c1847ffbee9967064068ee8e23b141198.zip Qt-274fbf5c1847ffbee9967064068ee8e23b141198.tar.gz Qt-274fbf5c1847ffbee9967064068ee8e23b141198.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:
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.cpp | 6 |
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()) { |