summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfile.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-04-15 09:09:23 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-04-15 09:09:24 +0200
commit605617b5dce6ccd8826d07aabe2db781ae3aa9b4 (patch)
tree9b014020fce4f53e92442c6914e5bc6f6264e879 /src/corelib/io/qfile.cpp
parentd370878aa0510e1e51eb9014965f505e395f3f81 (diff)
parentd238f7e0190c49c0f07c24f2f4ef9a50577c389b (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5
Diffstat (limited to 'src/corelib/io/qfile.cpp')
-rw-r--r--src/corelib/io/qfile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index 5cc1e82e75..ce1684a943 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -199,9 +199,9 @@ QAbstractFileEngine *QFilePrivate::engine() const
\section1 Platform Specific Issues
- File permissions are handled differently on Linux/Mac OS X and
+ File permissions are handled differently on Unix-like systems and
Windows. In a non \l{QIODevice::isWritable()}{writable}
- directory on Linux, files cannot be created. This is not always
+ directory on Unix-like systems, files cannot be created. This is not always
the case on Windows, where, for instance, the 'My Documents'
directory usually is not writable, but it is still possible to
create files in it.