summaryrefslogtreecommitdiff
path: root/src/shared/cplusplus/CheckDeclaration.cpp
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2009-10-27 18:23:58 +0100
committercon <qtc-committer@nokia.com>2009-10-27 18:23:58 +0100
commit68f193a1890c91ecdd25e4077004ecb10cbd33de (patch)
treeae387d5f5408407a9b5f67a388f71110d3b8a9da /src/shared/cplusplus/CheckDeclaration.cpp
parent78d89b549a62bb2e869dc371b565cf17c0b55e0f (diff)
parent33fedfea6471703a7ca6967f322e89b476bde731 (diff)
downloadqt-creator-68f193a1890c91ecdd25e4077004ecb10cbd33de.tar.gz
Merge commit 'origin/1.3'
Conflicts: src/plugins/debugger/gdb/gdbengine.cpp Needed changes: src/plugins/qt4projectmanager/qtversionmanager.cpp
Diffstat (limited to 'src/shared/cplusplus/CheckDeclaration.cpp')
-rw-r--r--src/shared/cplusplus/CheckDeclaration.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/cplusplus/CheckDeclaration.cpp b/src/shared/cplusplus/CheckDeclaration.cpp
index 6a81784360..7e7d01d907 100644
--- a/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/src/shared/cplusplus/CheckDeclaration.cpp
@@ -190,6 +190,7 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
fun->setScope(_scope);
fun->setName(name);
fun->setMethodKey(semantic()->currentMethodKey());
+ fun->setVirtual(ty.isVirtual());
if (isQ_SIGNAL)
fun->setMethodKey(Function::SignalMethod);
else if (isQ_SLOT)
@@ -281,6 +282,7 @@ bool CheckDeclaration::visit(FunctionDefinitionAST *ast)
}
Function *fun = funTy->asFunctionType();
+ fun->setVirtual(ty.isVirtual());
fun->setStartOffset(tokenAt(ast->firstToken()).offset);
fun->setEndOffset(tokenAt(ast->lastToken()).offset);
if (ast->declarator)