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

Conflicts:
	src/tools/qdoc/tree.cpp
	tests/auto/gui/painting/qcolor/tst_qcolor.cpp

Change-Id: Iaa78f601a63191fa643aabf853520f913f2f0fdc

1 files changed, 4 insertions, 3 deletions

diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp
index ca044ff78fe..0da963fe0b4 100644
--- a/src/tools/qdoc/tree.cpp
+++ b/src/tools/qdoc/tree.cpp
@@ -388,7 +388,6 @@ void Tree::resolveInheritanceHelper(int pass, ClassNode* cn)
         while (b != bases.end()) {
             if (!(*b).node_) {
                 Node* n = qdb_->findClassNode((*b).path_);
-#if 0
                 /*
                   If the node for the base class was not found,
                   the reason might be that the subclass is in a
@@ -401,9 +400,11 @@ void Tree::resolveInheritanceHelper(int pass, ClassNode* cn)
                  */
                 if (!n) {
                     Aggregate* parent = cn->parent();
-                    n = findClassNode((*b).path_, parent);
+                    if (parent)
+                        // Exclude the root namespace
+                        if (parent->isNamespace() && !parent->name().isEmpty())
+                            n = findClassNode((*b).path_, parent);
                 }
-#endif
                 if (n) {
                     ClassNode* bcn = static_cast<ClassNode*>(n);
                     (*b).node_ = bcn;