diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-06 23:51:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-06 23:51:29 (GMT) |
| commit | 065dbab836858b38537d601cb55af0b838a2d0fd (patch) | |
| tree | 589087528a14b11a2ead1e9368d179e0f74a2b2b /src/corelib | |
| parent | b7513f4a15ecac1adf54f2abdda6b56c89d6bef4 (diff) | |
| parent | 18411bfd474b05fd427b3d763af2fcc96e3e73df (diff) | |
| download | Qt-065dbab836858b38537d601cb55af0b838a2d0fd.zip Qt-065dbab836858b38537d601cb55af0b838a2d0fd.tar.gz Qt-065dbab836858b38537d601cb55af0b838a2d0fd.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed bug in QIODevice::read after first reading 0 bytes.
Recalculate script item widths when forcing justification
QGraphicsWidget was not working properly when ItemSendsPositionChanges is false
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qiodevice.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index bb11d6b..223df9b 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -810,6 +810,9 @@ qint64 QIODevice::read(char *data, qint64 maxSize) } } + if (!maxSize) + return readSoFar; + if ((d->openMode & Unbuffered) == 0 && maxSize < QIODEVICE_BUFFERSIZE) { // In buffered mode, we try to fill up the QIODevice buffer before // we do anything else. |