Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: If7cf7604d1ead1cd1f9980a05ada6d2aa1de0dbf

2 files changed, 6 insertions, 15 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_;
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index b4f3f0cf2..fc44fdbc5 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -600,8 +600,11 @@ QString Generator::fullDocumentLocation(const Node *node, bool useSubdir)
 
     Node *parentNode = nullptr;
 
-    if ((parentNode = node->parent()))
-        parentName = fullDocumentLocation(node->parent());
+    if ((parentNode = node->parent())) {
+        // use the parent's name unless the parent is the root namespace
+        if (!node->parent()->isNamespace() || !node->parent()->name().isEmpty())
+            parentName = fullDocumentLocation(node->parent());
+    }
 
     switch (node->nodeType()) {
     case Node::Class: