diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-08-17 11:37:45 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-08-17 11:37:45 (GMT) |
| commit | 9b4982af65e533b0613abd0f889bcf6e7673e410 (patch) | |
| tree | 6da061304e5d58fc6306600a06e8de07db246788 /src/corelib/io/qiodevice.cpp | |
| parent | efd84105355552bcb203b5e402be0352641e7480 (diff) | |
| parent | dc2771eb57702a0daf5164b0f9ad569c9fe0e5ba (diff) | |
| download | Qt-9b4982af65e533b0613abd0f889bcf6e7673e410.zip Qt-9b4982af65e533b0613abd0f889bcf6e7673e410.tar.gz Qt-9b4982af65e533b0613abd0f889bcf6e7673e410.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/io/qiodevice.cpp')
| -rw-r--r-- | src/corelib/io/qiodevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 4108136..35b85c3 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -811,7 +811,7 @@ qint64 QIODevice::read(char *data, qint64 maxSize) #endif if (readFromDevice < bytesToBuffer) - d->buffer.truncate(readFromDevice < 0 ? 0 : int(readFromDevice)); + d->buffer.truncate(int(readFromDevice)); if (!d->buffer.isEmpty()) { lastReadChunkSize = d->buffer.read(data + readSoFar, maxSize - readSoFar); readSoFar += lastReadChunkSize; |