From 1c92de3944ca5bde13091f4983869c755c682bfb Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 19 Jan 2024 10:12:44 +0100 Subject: [PATCH] Doc: fix QStandardPaths::displayName qdoc warning on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function definition at the location of the documentation is not used on Q_OS_DARWIN, so qdoc cannot tie the documentation to it, leaving broken links and qdoc warnings when building the documentation on macOS. Fix this by explicitly specifying the function that's being documented. Change-Id: Icf2ad1eba9e9ec8cbeea3818b414f740fa31083f Reviewed-by: Tor Arne Vestbø Reviewed-by: Thiago Macieira Reviewed-by: Safiyyah Moosa (cherry picked from commit f63e5318261de755dfeb3d8faedc52333a37c96d) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/io/qstandardpaths.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp index 925a48dc945..792721f50d4 100644 --- a/src/corelib/io/qstandardpaths.cpp +++ b/src/corelib/io/qstandardpaths.cpp @@ -540,6 +540,8 @@ QString QStandardPaths::findExecutable(const QString &executableName, const QStr } /*! + \fn QString QStandardPaths::displayName(StandardLocation type) + \include standardpath/functiondocs.qdocinc displayName */