Merge remote-tracking branch 'origin/2.5'

Conflicts: src/libs/cplusplus/cplusplus-lib.pri Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
2012-07-24 14:17:33 +02:00
parent 3f6eed50c9 cebf6b9329
commit 42f4595e37
10 changed files with 1597 additions and 887 deletions
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -1448,6 +1448,13 @@ bool CppCompletionAssistProcessor::completeScope(const QList<CPlusPlus::LookupIt
                break;
            }

+        } else if (Template *templ = ty->asTemplateType()) {
+            if (!result.binding())
+                continue;
+            if (ClassOrNamespace *b = result.binding()->lookupType(templ->name())) {
+                completeClass(b);
+                break;
+            }
        }
    }