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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	doc/templates/style/style.css
	qtcreator.pri

Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d
This commit is contained in:
Eike Ziller
2012-04-27 17:02:39 +02:00
parent 6c5bec6e65 29062c64f7
commit 9092e70884
28 changed files with 735 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cppeditor/cppfunctiondecldeflink.cpp
View File

@@ -197,6 +197,7 @@ static QSharedPointer<FunctionDeclDefLink> findLinkHelper(QSharedPointer<Functio
// the parens are necessary for finding good places for changes
if (!targetFuncDecl->lparen_token || !targetFuncDecl->rparen_token)
return noResult;
QTC_ASSERT(targetFuncDecl->symbol, return noResult);
// if the source and target argument counts differ, something is wrong
QTC_ASSERT(targetFuncDecl->symbol->argumentCount() == link->sourceFunction->argumentCount(), return noResult);