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

qdoc: Add details to messages about not finding files. 

Print example directories and files.

Change-Id: I58553f45f87ec2c2036a8c4ddf9ffb54baa75870
Reviewed-by: Martin Smith <martin.smith@digia.com>
Friedemann Kleint 2015-03-25 14:02:42 +01:00
parent 49217e9657
commit 58da6f96a8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/qdoc/cppcodeparser.cpp
View File

@ -2425,8 +2425,11 @@ void CppCodeParser::createExampleFileNodes(DocumentNode *dn)
proFileName,
userFriendlyFilePath);
if (fullPath.isEmpty()) {
dn->location().warning(tr("Cannot find file '%1' or '%2'").arg(tmp).arg(proFileName));
dn->location().warning(tr(" EXAMPLE PATH DOES NOT EXIST: %1").arg(examplePath));
QString details = QLatin1String("Example directories: ") + exampleDirs.join(QLatin1Char(' '));
if (!exampleFiles.isEmpty())
details += QLatin1String(", example files: ") + exampleFiles.join(QLatin1Char(' '));
dn->location().warning(tr("Cannot find file '%1' or '%2'").arg(tmp).arg(proFileName), details);
dn->location().warning(tr(" EXAMPLE PATH DOES NOT EXIST: %1").arg(examplePath), details);
return;
}
}

5
src/tools/qdoc/doc.cpp
View File

@ -3305,7 +3305,10 @@ CodeMarker *Doc::quoteFromFile(const Location &location,
DocParser::exampleDirs,
fileName, userFriendlyFilePath);
if (filePath.isEmpty()) {
location.warning(tr("Cannot find file to quote from: '%1'").arg(fileName));
QString details = QLatin1String("Example directories: ") + DocParser::exampleDirs.join(QLatin1Char(' '));
if (!DocParser::exampleFiles.isEmpty())
details += QLatin1String(", example files: ") + DocParser::exampleFiles.join(QLatin1Char(' '));
location.warning(tr("Cannot find file to quote from: '%1'").arg(fileName), details);
}
else {
QFile inFile(filePath);