Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48

1 files changed, 3 insertions, 1 deletions

diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 20a562562e..79f10f5f46 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -911,6 +911,8 @@ private:
     static QList<LookupItem> typedefsFromScopeUpToFunctionScope(const Name *name, Scope *scope)
     {
         QList<LookupItem> results;
+        if (!scope)
+            return results;
         Scope *enclosingBlockScope = 0;
         for (Block *block = scope->asBlock(); block;
              block = enclosingBlockScope ? enclosingBlockScope->asBlock() : 0) {
@@ -994,7 +996,7 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
     TypedefsResolver typedefsResolver(_context);
 
     foreach (const LookupItem &r, baseResults) {
-        if (!r.type().type())
+        if (!r.type().type() || !r.scope())
             continue;
         FullySpecifiedType ty = r.type().simplified();
         FullySpecifiedType originalType = ty;