diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-11-10 17:16:25 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-11-11 11:51:02 (GMT) |
| commit | 425272e7405eed077cb65a101d5dd1fafc4b11d2 (patch) | |
| tree | c6909b5941f553caf633fe68cbaf3ddeca89af1a /src | |
| parent | d8213cbff66784a3e1132e278d608500f88975f2 (diff) | |
| download | Qt-425272e7405eed077cb65a101d5dd1fafc4b11d2.zip Qt-425272e7405eed077cb65a101d5dd1fafc4b11d2.tar.gz Qt-425272e7405eed077cb65a101d5dd1fafc4b11d2.tar.bz2 | |
Fix warning when using QXmlInputSource with non opened QIODevice
Calling setTextModeEnabled on a QIODevice that is not open generates
a warning as a result of QTBUG-20905. Previously, it caused incorrect
behaviour when called with true.
Now only call it if the QIODevice passed in is already opened.
If not open, then it is opened by the xml reader without text mode,
so there is no difference in behaviour.
xml autotests still pass, although this removes several QWARN messages
from the qdom autotest.
Task-number: QTBUG-22659
Change-Id: Ie3137e44fe776bff6371ebd008428110168717ec
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
(cherry picked from commit d457f148cf1efbea3db5fdc87c418cc9647e2baf)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xml/sax/qxml.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 0c7f2ab..c4c5f0c 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -1321,7 +1321,8 @@ QXmlInputSource::QXmlInputSource(QIODevice *dev) { init(); d->inputDevice = dev; - d->inputDevice->setTextModeEnabled(false); + if (dev->isOpen()) + d->inputDevice->setTextModeEnabled(false); } #ifdef QT3_SUPPORT |