summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qiodevice.cpp
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2015-02-18 14:49:44 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2015-03-31 12:49:01 +0000
commit19a91b4a3531d331362fcefd87c43366ae142f57 (patch)
treee1e1b50ab8cc8198d955eb3697730e69dd199669 /src/corelib/io/qiodevice.cpp
parent180ee8a8de459b752f739e1a9d56d271303d0302 (diff)
Doc: Fix using Apple-related terminology in Qt Core
Use the name "OS X" instead of "Mac OS X", "Mac OS" and "OSX", and mention iOS. Replace "Carbon Preferences API" by "CFPreferences API" in the QSettings documentation. Change-Id: Ia7f9fb874276c7c445a1649df521b96ff43daa0c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/corelib/io/qiodevice.cpp')
-rw-r--r--src/corelib/io/qiodevice.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 35911934df..a3e89a7b89 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -669,7 +669,7 @@ bool QIODevice::seek(qint64 pos)
For some devices, atEnd() can return true even though there is more data
to read. This special case only applies to devices that generate data in
direct response to you calling read() (e.g., \c /dev or \c /proc files on
- Unix and Mac OS X, or console input / \c stdin on all platforms).
+ Unix and OS X, or console input / \c stdin on all platforms).
\sa bytesAvailable(), read(), isSequential()
*/