diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-07-24 14:17:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-07-24 14:17:33 +0200 |
| commit | 42f4595e37fc859582e0bb0f332d50bd80e22973 (patch) | |
| tree | 008bf32443019517e2875ed79057be24a2f36fca /src/plugins/cpptools/cppcompletionassist.cpp | |
| parent | 3f6eed50c90f28be543af439a0e2a8719d372b09 (diff) | |
| parent | cebf6b9329deeab410e09f09a17b9a611a40282d (diff) | |
| download | qt-creator-42f4595e37fc859582e0bb0f332d50bd80e22973.tar.gz | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
src/libs/cplusplus/cplusplus-lib.pri
Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
Diffstat (limited to 'src/plugins/cpptools/cppcompletionassist.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcompletionassist.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index 95561319f6..6397abafcc 100644 --- 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; + } } } |