summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qiodevice.cpp
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2010-03-22 03:28:38 (GMT)
committerDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2010-03-22 03:28:38 (GMT)
commit0dff17f1e08f57040f3a156f9f3675024ec59978 (patch)
tree0b3c47a172b90acfd3582b7f6d04bb9b8d9ff780 /src/corelib/io/qiodevice.cpp
parent1ef014ebae2c28c38c25facd90ba8be71b195195 (diff)
parentdbd293e2579e80756ca7e711ea1f82b9e42c5b92 (diff)
downloadQt-0dff17f1e08f57040f3a156f9f3675024ec59978.zip
Qt-0dff17f1e08f57040f3a156f9f3675024ec59978.tar.gz
Qt-0dff17f1e08f57040f3a156f9f3675024ec59978.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/corelib/io/qiodevice.cpp')
-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