From dc1f1cc310b6da77c313ab045192dc99da3951a1 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Mon, 7 Feb 2011 12:17:20 +0100 Subject: [PATCH] C++: Fix Bind run on QtPropertyDeclarationAST. Also adjust findusages test to account for QtProperty symbol. Reviewed-by: Erik Verbruggen --- src/shared/cplusplus/Bind.cpp | 2 ++ tests/auto/cplusplus/findusages/tst_findusages.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/shared/cplusplus/Bind.cpp b/src/shared/cplusplus/Bind.cpp index 13cab8c3cd5..0ca8e71ba99 100644 --- a/src/shared/cplusplus/Bind.cpp +++ b/src/shared/cplusplus/Bind.cpp @@ -1892,6 +1892,8 @@ bool Bind::visit(QtPropertyDeclarationAST *ast) for (QtPropertyDeclarationItemListAST *it = ast->property_declaration_item_list; it; it = it->next) { if (!it->value || !it->value->item_name_token) continue; + this->expression(it->value->expression); + std::string name = spell(it->value->item_name_token); if (name == "CONSTANT") { diff --git a/tests/auto/cplusplus/findusages/tst_findusages.cpp b/tests/auto/cplusplus/findusages/tst_findusages.cpp index 2d423e06f07..94b054d7d72 100644 --- a/tests/auto/cplusplus/findusages/tst_findusages.cpp +++ b/tests/auto/cplusplus/findusages/tst_findusages.cpp @@ -180,8 +180,8 @@ void tst_FindUsages::qproperty_1() Class *tst = doc->globalSymbolAt(0)->asClass(); QVERIFY(tst); - QCOMPARE(tst->memberCount(), 4U); - Function *setX_method = tst->memberAt(1)->asFunction(); + QCOMPARE(tst->memberCount(), 5U); + Function *setX_method = tst->memberAt(2)->asFunction(); QVERIFY(setX_method); QCOMPARE(setX_method->identifier()->chars(), "setX"); QCOMPARE(setX_method->argumentCount(), 1U);