diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-03-24 14:36:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-03-24 14:36:02 +0100 |
| commit | 576dc2c7010904b2ace4cdd7284599d696832186 (patch) | |
| tree | 839f30eff1d150f3e0228fe1f4145986cf2eebe0 /src/corelib/io/qfileinfo.cpp | |
| parent | 6a972f44f3f88d6179e8e4eef54396b5808b3f4d (diff) | |
| parent | cc1d891b8ed1c4f23183e4b06f46e5840a993e35 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/plugins/platforms/xcb/qxcbdrag.cpp
Change-Id: I0b47324b70b0b4894e54b21aa3e7a5041f9bd5e3
Diffstat (limited to 'src/corelib/io/qfileinfo.cpp')
| -rw-r--r-- | src/corelib/io/qfileinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 64b1557231..84bca6e993 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -272,7 +272,7 @@ QDateTime &QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime request) info objects, just append one to the file name given to the constructors or setFile(). - The file's dates are returned by created(), lastModified(), lastRead() and + The file's dates are returned by birthTime(), lastModified(), lastRead() and fileTime(). Information about the file's access permissions is obtained with isReadable(), isWritable() and isExecutable(). The file's ownership is available from owner(), ownerId(), group() and |