Merge ichecker branch changes into the mainline. New project can be found under src/tools/ICheck

1 files changed, 21 insertions, 15 deletions

diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 4ad7854d77..7b9ad5ec41 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -871,27 +871,33 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
                     expandBuiltinMacro(identifierToken, spell);
 
                 else {
-                    if (Macro *m = env->resolve(spell)) {
-                        if (! m->isFunctionLike()) {
-                            if (0 == (m = processObjectLikeMacro(identifierToken, spell, m)))
-                                continue;
+#ifdef ICHECK_BUILD
+                    if(spell != "Q_PROPERTY" && spell != "Q_INVOKABLE" && spell != "Q_ENUMS"
+                        && spell != "Q_FLAGS" && spell != "Q_DECLARE_FLAGS"){
+#endif
+                        if (Macro *m = env->resolve(spell)) {
+                            if (! m->isFunctionLike()) {
+                                if (0 == (m = processObjectLikeMacro(identifierToken, spell, m)))
+                                    continue;
 
-                            // the macro expansion generated something that looks like
-                            // a function-like macro.
-                        }
+                                // the macro expansion generated something that looks like
+                                // a function-like macro.
+                            }
 
-                        // `m' is function-like macro.
-                        if (_dot->is(T_LPAREN)) {
-                            QVector<MacroArgumentReference> actuals;
-                            collectActualArguments(&actuals);
+                            // `m' is function-like macro.
+                            if (_dot->is(T_LPAREN)) {
+                                QVector<MacroArgumentReference> actuals;
+                                collectActualArguments(&actuals);
 
-                            if (_dot->is(T_RPAREN)) {
-                                expandFunctionLikeMacro(identifierToken, m, actuals);
-                                continue;
+                                if (_dot->is(T_RPAREN)) {
+                                    expandFunctionLikeMacro(identifierToken, m, actuals);
+                                    continue;
+                                }
                             }
                         }
+#ifdef ICHECK_BUILD
                     }
-
+#endif
                     // it's not a function or object-like macro.
                     out(spell);
                 }