1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some qdoc warnings: std::filesystem::path getters

Browse Source 
Those APIs need to be declared for qdoc runs, even if cxx17_filesystem is not.

Change-Id: Iaa437aa424f35d0414b6b79328bcafb49af872b3
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-09-22 16:23:07 +02:00
parent 1d6b7a27cb
commit a6a2c00ee3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qdir.h
View File

@ -139,7 +139,7 @@ public:
QString path() const;
QString absolutePath() const;
QString canonicalPath() const;
#if QT_CONFIG(cxx17_filesystem)
#if QT_CONFIG(cxx17_filesystem) || defined(Q_CLANG_QDOC)
std::filesystem::path filesystemPath() const
{ return QtPrivate::toFilesystemPath(path()); }
std::filesystem::path filesystemAbsolutePath() const

2
src/corelib/io/qfile.h
View File

@ -125,7 +125,7 @@ public:
~QFile();
QString fileName() const override;
#if QT_CONFIG(cxx17_filesystem)
#if QT_CONFIG(cxx17_filesystem) || defined(Q_CLANG_QDOC)
std::filesystem::path filesystemFileName() const
{ return QtPrivate::toFilesystemPath(fileName()); }
#endif

4
src/corelib/io/qfileinfo.h
View File

@ -104,7 +104,7 @@ public:
QString filePath() const;
QString absoluteFilePath() const;
QString canonicalFilePath() const;
#if QT_CONFIG(cxx17_filesystem)
#if QT_CONFIG(cxx17_filesystem) || defined(Q_CLANG_QDOC)
std::filesystem::path filesystemFilePath() const
{ return QtPrivate::toFilesystemPath(filePath()); }
std::filesystem::path filesystemAbsoluteFilePath() const
@ -122,7 +122,7 @@ public:
QString path() const;
QString absolutePath() const;
QString canonicalPath() const;
#if QT_CONFIG(cxx17_filesystem)
#if QT_CONFIG(cxx17_filesystem) || defined(Q_CLANG_QDOC)
std::filesystem::path filesystemPath() const { return QtPrivate::toFilesystemPath(path()); }
std::filesystem::path filesystemAbsolutePath() const
{ return QtPrivate::toFilesystemPath(absolutePath()); }