feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
This commit is contained in:
Eike Ziller
2013-04-11 18:27:52 +02:00
parent e6eb061293 567098f210
commit 9ff8979da3
64 changed files with 961 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -502,7 +502,9 @@ public:
BasicProposalItem *operator()(Symbol *symbol)
{
if (! symbol || ! symbol->name() || symbol->name()->isQualifiedNameId())
//using declaration can be qualified
if (! symbol || ! symbol->name() || (symbol->name()->isQualifiedNameId()
&& ! symbol->asUsingDeclaration()))
return 0;
BasicProposalItem *previousItem = switchCompletionItem(0);