Removed Q_DECLARE_FLAGS parsing, leaving it to the CPP to expand it.

3 files changed, 4 insertions, 17 deletions

diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.cpp b/src/libs/cplusplus/CheckUndefinedSymbols.cpp
index bd3cba0a36..f81b3fda8b 100644
--- a/src/libs/cplusplus/CheckUndefinedSymbols.cpp
+++ b/src/libs/cplusplus/CheckUndefinedSymbols.cpp
@@ -540,20 +540,6 @@ bool CheckUndefinedSymbols::visit(ObjCPropertyDeclarationAST *ast)
     return false;
 }
 
-bool CheckUndefinedSymbols::visit(QtDeclareFlagsDeclarationAST *ast)
-{
-    // ### check flags name too?
-
-    if (ast->enum_name && ast->enum_name->name) {
-        const Identifier *enumId = ast->enum_name->name->identifier();
-        if (!isType(enumId)) // ### we're only checking if the enum name is known as a type name, not as an *enum*.
-            translationUnit()->warning(ast->enum_name->firstToken(),
-                                       "unknown enum '%s'",
-                                       enumId->chars());
-    }
-    return false;
-}
-
 bool CheckUndefinedSymbols::visit(QtEnumDeclarationAST *ast)
 {
     for (NameListAST *iter = ast->enumerator_list; iter; iter = iter->next) {
diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.h b/src/libs/cplusplus/CheckUndefinedSymbols.h
index dc7aa79dc3..bc55ae8f6d 100644
--- a/src/libs/cplusplus/CheckUndefinedSymbols.h
+++ b/src/libs/cplusplus/CheckUndefinedSymbols.h
@@ -98,7 +98,6 @@ protected:
     virtual bool visit(ObjCProtocolRefsAST *ast);
     virtual bool visit(ObjCPropertyDeclarationAST *ast);
 
-    virtual bool visit(QtDeclareFlagsDeclarationAST *ast);
     virtual bool visit(QtEnumDeclarationAST *ast);
     virtual bool visit(QtFlagsDeclarationAST *ast);
     virtual bool visit(QtPropertyDeclarationAST *ast);
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 7c9fe50b39..3f3c7099a1 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -766,8 +766,10 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
                     expandBuiltinMacro(identifierToken, spell);
 
                 else {
-                    if (spell != "Q_PROPERTY" && spell != "Q_INVOKABLE" && spell != "Q_ENUMS"
-                        && spell != "Q_FLAGS" && spell != "Q_DECLARE_FLAGS") {
+                    if (spell != "Q_PROPERTY"
+                        && spell != "Q_INVOKABLE"
+                        && spell != "Q_ENUMS"
+                        && spell != "Q_FLAGS") {
 
                         // ### FIXME: shouldn't this be T_Q_PROPERTY & friends?