diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-16 00:31:12 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-16 00:31:12 (GMT) |
| commit | e56c5483fe8b292545bb9f004d796abd8ae00589 (patch) | |
| tree | 6666a5efb67c718831f34d7f1e9ca4b5fa8050b9 /src/corelib/io | |
| parent | ee8375dd20823173fd8df03481f19db245af1a7f (diff) | |
| parent | a0f2c60dd9f6f44b7016f879b5b3ec32c665fdb9 (diff) | |
| download | Qt-e56c5483fe8b292545bb9f004d796abd8ae00589.zip Qt-e56c5483fe8b292545bb9f004d796abd8ae00589.tar.gz Qt-e56c5483fe8b292545bb9f004d796abd8ae00589.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qiodevice.cpp | 3 |
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 |