Sorry this was not supposed to be committed.

Revert "Revert "Try to fix the type rewriter.""

This reverts commit c9bc1e7c64.

src/libs/cplusplus/ResolveExpression.cpp

@@ -568,9 +568,10 @@ QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const
                 }
 
                 SubstitutionEnvironment env;
-                ContextSubstitution ctxSubst(_context, m.scope());
+                if (m.scope())
+                    env.switchScope(m.scope());
+                env.setContext(_context);
 
-                env.enter(&ctxSubst);
                 env.enter(&map);
                 FullySpecifiedType instantiatedTy = rewriteType(decl->type(), &env, _context.control().data());