Fixed Q_PROPERTY parsing to handle all possible cases.

1 files changed, 3 insertions, 20 deletions

diff --git a/src/shared/cplusplus/CheckDeclaration.cpp b/src/shared/cplusplus/CheckDeclaration.cpp
index a9ede700ca..2eb017b2a1 100644
--- a/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/src/shared/cplusplus/CheckDeclaration.cpp
@@ -56,9 +56,12 @@
 #include "Symbols.h"
 #include "Control.h"
 #include "Literals.h"
+#include "QtContextKeywords.h"
 #include <string>
 #include <cassert>
 
+#include <QDebug>
+
 using namespace CPlusPlus;
 
 CheckDeclaration::CheckDeclaration(Semantic *semantic)
@@ -815,23 +818,3 @@ bool CheckDeclaration::visit(QtFlagsDeclarationAST *ast)
         semantic()->check(iter->value, _scope);
     return false;
 }
-
-bool CheckDeclaration::visit(QtPropertyDeclarationAST *ast)
-{
-    if (ast->type_id)
-        semantic()->check(ast->type_id, _scope);
-    if (ast->property_name)
-        semantic()->check(ast->property_name, _scope);
-
-    for (QtPropertyDeclarationItemListAST *iter = ast->property_declaration_items;
-         iter; iter = iter->next) {
-        if (! iter->value)
-            continue;
-
-        if (QtPropertyDeclarationNamingItemAST *namedItem = iter->value->asQtPropertyDeclarationNamingItem())
-            if (namedItem->name_value)
-                semantic()->check(namedItem->name_value, _scope);
-    }
-
-    return false;
-}