summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-11 17:28:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-11 17:28:35 (GMT)
commitf4053c19b3e5584f97cfb0eb14d4b488259291b4 (patch)
treee1c66f8dee64bc102d8eaaef78ccd911becf507d /src/corelib
parent655a79094749f13f4b72d94a7b768ac89d21c7f4 (diff)
parent37353a95fd11ec03ccde5c4e85ef2f0a605b85db (diff)
downloadQt-f4053c19b3e5584f97cfb0eb14d4b488259291b4.zip
Qt-f4053c19b3e5584f97cfb0eb14d4b488259291b4.tar.gz
Qt-f4053c19b3e5584f97cfb0eb14d4b488259291b4.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: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 ) Doc: Removed lie that access to QBuffer is unbuffered. Minisplitter doesn't paint to the bottom/right Avoid unnecessary memory allocation in the jpeg handler's image detection
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qiodevice.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 662100a..c93f0c3 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -282,8 +282,7 @@ QIODevicePrivate::~QIODevicePrivate()
Certain flags, such as \c Unbuffered and \c Truncate, are
meaningless when used with some subclasses. Some of these
restrictions are implied by the type of device that is represented
- by a subclass; for example, access to a QBuffer is always
- unbuffered. In other cases, the restriction may be due to the
+ by a subclass. In other cases, the restriction may be due to the
implementation, or may be imposed by the underlying platform; for
example, QTcpSocket does not support \c Unbuffered mode, and
limitations in the native API prevent QFile from supporting \c