From 58da6f96a84e6e140d384b2e422c0fdf020897ea Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 25 Mar 2015 14:02:42 +0100 Subject: qdoc: Add details to messages about not finding files. Print example directories and files. Change-Id: I58553f45f87ec2c2036a8c4ddf9ffb54baa75870 Reviewed-by: Martin Smith --- src/tools/qdoc/cppcodeparser.cpp | 7 +++++-- src/tools/qdoc/doc.cpp | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp index bc24ff5daa..4fbe20b09e 100644 --- a/src/tools/qdoc/cppcodeparser.cpp +++ b/src/tools/qdoc/cppcodeparser.cpp @@ -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; } } diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp index e911eed28b..92c6d405de 100644 --- a/src/tools/qdoc/doc.cpp +++ b/src/tools/qdoc/doc.cpp @@ -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); -- cgit v1.2.3