diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 16:13:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 16:13:04 (GMT) |
| commit | a0b027c9e29cdc75ffe857e19e9892e88bde722e (patch) | |
| tree | e9cb3687365763dca4c666e1c6697a1590982887 | |
| parent | 9416eccc75f3f3ee027d216ec3bcdb7d440ffde3 (diff) | |
| parent | aea71e2e02fa966842b094244bc3f5fc88f50f41 (diff) | |
| download | Qt-a0b027c9e29cdc75ffe857e19e9892e88bde722e.zip Qt-a0b027c9e29cdc75ffe857e19e9892e88bde722e.tar.gz Qt-a0b027c9e29cdc75ffe857e19e9892e88bde722e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix autotest failure: QIODevice::read() on a closed device must return -1
| -rw-r--r-- | src/corelib/io/qiodevice.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index f83c142..f2cef4e1 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -755,6 +755,7 @@ qint64 QIODevice::bytesToWrite() const qint64 QIODevice::read(char *data, qint64 maxSize) { Q_D(QIODevice); + CHECK_READABLE(read, qint64(-1)); #if defined QIODEVICE_DEBUG printf("%p QIODevice::read(%p, %d), d->pos = %d, d->buffer.size() = %d\n", |