diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-13 12:05:58 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-13 12:05:58 (GMT) |
| commit | 235bdeea52059010ef2e92058adb1213161b0956 (patch) | |
| tree | bcf24441076d47835cdd4dce90f71c43cc9d020c /src/gui/image | |
| parent | 3e94b3a77affeef80544e48949e018ced4e0d96e (diff) | |
| parent | 8e6b240eef98060737324e33b09f4323ced58213 (diff) | |
| download | Qt-235bdeea52059010ef2e92058adb1213161b0956.zip Qt-235bdeea52059010ef2e92058adb1213161b0956.tar.gz Qt-235bdeea52059010ef2e92058adb1213161b0956.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Diffstat (limited to 'src/gui/image')
| -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 5a882af..6bebefc 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; } |