diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 14:42:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 14:42:40 (GMT) |
| commit | 72c0128f607d1566ede78dfbba90507086e3fe80 (patch) | |
| tree | 16672fa24e67319c7c11c6932c680a808bafa357 /src | |
| parent | 957f36cb498657f94f1b5b92f52713254ff8c051 (diff) | |
| parent | 059884feccfda94a16a7939b3394250723ed7c07 (diff) | |
| download | Qt-72c0128f607d1566ede78dfbba90507086e3fe80.zip Qt-72c0128f607d1566ede78dfbba90507086e3fe80.tar.gz Qt-72c0128f607d1566ede78dfbba90507086e3fe80.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix segfault, if QPixmap::loadFromData() fails
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qpixmap_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp index e1e8a0d..f6905d7 100644 --- a/src/gui/image/qpixmap_x11.cpp +++ b/src/gui/image/qpixmap_x11.cpp @@ -383,7 +383,7 @@ struct QX11AlphaDetector return has; // Will implicitly also check format and return quickly for opaque types... checked = true; - has = const_cast<QImage *>(image)->data_ptr()->checkForAlphaPixels(); + has = image->isNull() ? false : const_cast<QImage *>(image)->data_ptr()->checkForAlphaPixels(); return has; } |