summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2019-06-06 13:56:02 +0200
committerMartin Smith <martin.smith@qt.io>2019-06-07 12:27:44 +0000
commit8e3c53a196f66a1c9a370cda1dfde51792f92364 (patch)
treec30f47ec46a22ead950fb5730155fb3d6acbaa2f
parentb18d7b5b4a9bc516bea9f36e3b00084cf6f11e26 (diff)
downloadqttools-8e3c53a196f66a1c9a370cda1dfde51792f92364.tar.gz
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 <fabian@ritter-vogt.de> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/qdoc/clangcodeparser.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp
index add84b9a9..be7bde02f 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/clangcodeparser.cpp
@@ -1176,13 +1176,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();
@@ -1190,17 +1189,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_;