diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-15 17:44:28 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-15 17:44:35 (GMT) |
| commit | ad0f3996a9674def59766726db34191844d2af0a (patch) | |
| tree | d029eeb8b988786a8859f98455e5bc3d9651cb80 /src/corelib/io | |
| parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
| parent | 5e47ee6a97f54f1cdac577f76cd338b40e624f32 (diff) | |
| download | Qt-ad0f3996a9674def59766726db34191844d2af0a.zip Qt-ad0f3996a9674def59766726db34191844d2af0a.tar.gz Qt-ad0f3996a9674def59766726db34191844d2af0a.tar.bz2 | |
Merge earth-team into master
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qtextstream.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index b630502..a5837cb 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -1264,6 +1264,7 @@ qint64 QTextStream::pos() const return qint64(-1); } thatd->readBufferOffset = oldReadBufferOffset; + thatd->readConverterSavedStateOffset = 0; // Return the device position. return d->device->pos(); |