From a6a2c00ee32f6d80b2dc7af65f8be53f5198722f Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 22 Sep 2020 16:23:07 +0200 Subject: Fix some qdoc warnings: std::filesystem::path getters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Those APIs need to be declared for qdoc runs, even if cxx17_filesystem is not. Change-Id: Iaa437aa424f35d0414b6b79328bcafb49af872b3 Reviewed-by: Mårten Nordheim --- src/corelib/io/qdir.h | 2 +- src/corelib/io/qfile.h | 2 +- src/corelib/io/qfileinfo.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index f4cf621e80..8b8aa05223 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -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 diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index 93002318fb..2074bd1cc4 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -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 diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index 669a6bcea1..40cb0125ed 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -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()); } -- cgit v1.2.3