From ff66d8bb392db5e76409ecbe4e25785e896d950e Mon Sep 17 00:00:00 2001
From: aavit <qt-info@nokia.com>
Date: Fri, 19 Mar 2010 15:13:04 +0100
Subject: Let QImageReader open the device if it is not open already

This brings the actual behaviour in line with the doc of setDevice().

Reviewed-by: Trond
---
 src/gui/image/qimagereader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 9320cfc..27f9627 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -503,7 +503,7 @@ QImageReaderPrivate::~QImageReaderPrivate()
 bool QImageReaderPrivate::initHandler()
 {
     // check some preconditions
-    if (!device || (!deleteDevice && !device->isOpen())) {
+    if (!device || (!deleteDevice && !device->isOpen() && !device->open(QIODevice::ReadOnly))) {
         imageReaderError = QImageReader::DeviceError;
         errorString = QLatin1String(QT_TRANSLATE_NOOP(QImageReader, "Invalid device"));
         return false;
-- 
cgit v0.12