Merge commit 'origin/1.3'

src/libs/cplusplus/CppBindings.cpp

@@ -676,6 +676,8 @@ ClassBinding *Binder::findClassBinding(Name *name)
     if (classBinding) {
         if (ClassBinding *k = classBinding->findClassBinding(name, &processed))
             return k;
+
+        processed.clear();
     }
 
     if (namespaceBinding)
@@ -718,8 +720,6 @@ bool Binder::visit(UsingNamespaceDirective *u)
 
 bool Binder::visit(Class *classSymbol)
 {
-    Overview oo;
-
     ClassBinding *binding = findOrCreateClassBinding(classSymbol);
     ClassBinding *previousClassBinding = switchClassBinding(binding);
 

src/libs/cplusplus/LookupContext.cpp

@@ -581,6 +581,8 @@ Symbol *LookupContext::canonicalSymbol(Symbol *symbol,
                                        NamespaceBinding *globalNamespace)
 {
     Symbol *canonicalSymbol = LookupContext::canonicalSymbol(symbol);
+    if (! canonicalSymbol)
+        return 0;
 
     if (Identifier *symbolId = canonicalSymbol->identifier()) {
         if (symbolId && canonicalSymbol->type()->isFunctionType()) {