whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix qdoc include paths for QStandardPaths 

Amends c30ffe1d33.

Fix
src/corelib/io/qstandardpaths.cpp:361: (qdoc) warning: Cannot find qdoc include file 'standardpath/functiondoc.qdocinc'
src/corelib/io/qstandardpaths.cpp:368: (qdoc) warning: Cannot find qdoc include file 'standardpath/functiondoc.qdocinc'
src/corelib/io/qstandardpaths.cpp:392: (qdoc) warning: Cannot find qdoc include file 'standardpath/functiondoc.qdocinc'
src/corelib/io/qstandardpaths.cpp:406: (qdoc) warning: Cannot find qdoc include file 'standardpath/functiondoc.qdocinc'
src/corelib/io/qstandardpaths.cpp:479: (qdoc) warning: Cannot find qdoc include file 'standardpath/functiondoc.qdocinc'
src/corelib/io/qstandardpaths.cpp:537: (qdoc) warning: Cannot find qdoc include file 'standardpath/functiondoc.qdocinc'
src/corelib/io/qstandardpaths.cpp:594: (qdoc) warning: Cannot find qdoc include file 'standardpath/functiondoc.qdocinc'

Task-number: QTBUG-79827
Change-Id: I8eb0ae7bc167151979c729964d2dc3f171e10568
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
bb10
Friedemann Kleint 2019-11-26 14:35:14 +01:00
parent da0af1e21d
commit e1d173d3ca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/io/qstandardpaths.cpp
View File

@ -357,14 +357,14 @@ QT_BEGIN_NAMESPACE
/*!
\fn QString QStandardPaths::writableLocation(StandardLocation type)
\include standardpath/functiondoc.qdocinc writableLocation
\include standardpath/functiondocs.qdocinc writableLocation
*/
/*!
\fn QStringList QStandardPaths::standardLocations(StandardLocation type)
\include standardpath/functiondoc.qdocinc standardLocations
\include standardpath/functiondocs.qdocinc standardLocations
\sa writableLocation()
*/
@ -388,7 +388,7 @@ static bool existsAsSpecified(const QString &path, QStandardPaths::LocateOptions
}
/*!
\include standardpath/functiondoc.qdocinc locate
\include standardpath/functiondocs.qdocinc locate
*/
QString QStandardPaths::locate(StandardLocation type, const QString &fileName, LocateOptions options)
{
@ -402,7 +402,7 @@ QString QStandardPaths::locate(StandardLocation type, const QString &fileName, L
}
/*!
\include standardpath/functiondoc.qdocinc locateAll
\include standardpath/functiondocs.qdocinc locateAll
*/
QStringList QStandardPaths::locateAll(StandardLocation type, const QString &fileName, LocateOptions options)
{
@ -475,7 +475,7 @@ static inline QString
#endif // Q_OS_WIN
/*!
\include standardpath/functiondoc.qdocinc findExecutable
\include standardpath/functiondocs.qdocinc findExecutable
*/
QString QStandardPaths::findExecutable(const QString &executableName, const QStringList &paths)
{
@ -533,7 +533,7 @@ QString QStandardPaths::findExecutable(const QString &executableName, const QStr
}
/*!
\include standardpath/functiondoc.qdocinc displayName
\include standardpath/functiondocs.qdocinc displayName
*/
#if !defined(Q_OS_MAC) && !defined(QT_BOOTSTRAPPED)
@ -590,7 +590,7 @@ QString QStandardPaths::displayName(StandardLocation type)
/*!
\fn void QStandardPaths::setTestModeEnabled(bool testMode)
\include standardpath/functiondoc.qdocinc setTestModeEnabled
\include standardpath/functiondocs.qdocinc setTestModeEnabled
*/
static bool qsp_testMode = false;