diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-17 09:16:04 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-17 09:16:04 (GMT) |
| commit | 0a852d51c6d74712cda8c7d08da4f5c90d99d5cd (patch) | |
| tree | 2ac9f365b8a25738d3756d051d7ccccea27bff7e /src/gui/image/qxbmhandler.cpp | |
| parent | cf74e83d8b79c4840c073bb7dc387045b1210df8 (diff) | |
| parent | e4fbdd4fde9b8d2acc13268b44caa57405c3db1a (diff) | |
| download | Qt-0a852d51c6d74712cda8c7d08da4f5c90d99d5cd.zip Qt-0a852d51c6d74712cda8c7d08da4f5c90d99d5cd.tar.gz Qt-0a852d51c6d74712cda8c7d08da4f5c90d99d5cd.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/image/qxbmhandler.cpp')
| -rw-r--r-- | src/gui/image/qxbmhandler.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp index 385340a..0dd4e99 100644 --- a/src/gui/image/qxbmhandler.cpp +++ b/src/gui/image/qxbmhandler.cpp @@ -261,13 +261,15 @@ bool QXbmHandler::readHeader() bool QXbmHandler::canRead() const { - if (state == Ready) { - if (!canRead(device())) - return false; + if (state == Ready && !canRead(device())) + return false; + + if (state != Error) { setFormat("xbm"); return true; } - return state != Error; + + return false; } bool QXbmHandler::canRead(QIODevice *device) |