From cc9250477eaa71a3f3ffd050591d4a9d835288ca Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 6 Jun 2019 13:56:02 +0200 Subject: qdoc: Don't log guessed include paths A complaint about excessive logging was received because of the logging of each guessed include path when qdoc is not given any include paths at all. This update removes the logging of those lines and changes the remaining single log line to: No include paths passed to qdoc; guessing reasonable include paths Task-number: QTBUG-76204 Change-Id: I000ee7959f00f654e750ac1b68a0c2b6dcccd472 Reviewed-by: Fabian Vogt Reviewed-by: Paul Wicking (cherry picked from commit 8e3c53a196f66a1c9a370cda1dfde51792f92364) Reviewed-by: Martin Smith --- src/qdoc/clangcodeparser.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp index 76ac62897..091df221e 100644 --- a/src/qdoc/clangcodeparser.cpp +++ b/src/qdoc/clangcodeparser.cpp @@ -1181,13 +1181,12 @@ bool ClangCodeParser::getMoreArgs() { bool guessedIncludePaths = false; if (includePaths_.isEmpty()) { - Location::logToStdErrAlways("No include paths passed to qdoc"); - Location::logToStdErrAlways("Guess reasonable include paths:"); /* The include paths provided are inadequate. Make a list of reasonable places to look for include files and use that list instead. */ + Location::logToStdErrAlways("No include paths passed to qdoc; guessing reasonable include paths"); guessedIncludePaths = true; auto forest = qdb_->searchOrder(); @@ -1195,17 +1194,6 @@ bool ClangCodeParser::getMoreArgs() QString basicIncludeDir = QDir::cleanPath(QString(Config::installDir + "/../include")); moreArgs_ += "-I" + basicIncludeDir.toLatin1(); moreArgs_ += includePathsFromHeaders(allHeaders_); - for (const auto p : moreArgs_) { - Location::logToStdErrAlways(p); - } -#if 0 - for (const auto &s : forest) { - QString module = basicIncludeDir +"/" + s->camelCaseModuleName(); - moreArgs_ += QString("-I" + module).toLatin1(); - moreArgs_ += QString("-I" + module + "/" + qdb_->version()).toLatin1(); - moreArgs_ += QString("-I" + module + "/" + qdb_->version() + "/" + module).toLatin1(); - } -#endif } else { moreArgs_ = includePaths_; -- cgit v1.2.1