diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 22:08:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 22:08:47 (GMT) |
| commit | 225e6b3992163b0452692f7a2cd6363b8e190ca9 (patch) | |
| tree | c6e2a96ff258dcb860843247dd1981f64e122222 | |
| parent | 780ee7c209c33490a5f77306880c8cd8bd0e82a6 (diff) | |
| parent | acd2e59f6b414d8bf2236c8059a8cf7f4b54998a (diff) | |
| download | Qt-225e6b3992163b0452692f7a2cd6363b8e190ca9.zip Qt-225e6b3992163b0452692f7a2cd6363b8e190ca9.tar.gz Qt-225e6b3992163b0452692f7a2cd6363b8e190ca9.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't use DirectFB for non-existing pixmaps
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index b5ac67d..4219f6f 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -174,6 +174,8 @@ bool QDirectFBPixmapData::hasAlphaChannel(const QImage &img) bool QDirectFBPixmapData::fromFile(const QString &filename, const char *format, Qt::ImageConversionFlags flags) { + if (!QFile::exists(filename)) + return false; if (flags == Qt::AutoColor) { if (filename.startsWith(QLatin1Char(':'))) { // resource QFile file(filename); |