diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-06 11:05:43 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-07 10:49:03 +0100 |
| commit | 8d8b05da5a93bcd8f45a2d1b796ff1e4b1102ff5 (patch) | |
| tree | 4aa3c52c3c3d428ccb2da1a68ad54ce698b7a282 /src/libs/cplusplus/pp-engine.cpp | |
| parent | 6ca5f5f5f886449f88d1ff7085f640c46bbc8fb2 (diff) | |
| download | qt-creator-8d8b05da5a93bcd8f45a2d1b796ff1e4b1102ff5.tar.gz | |
Reworked parts of the QtPropertyDeclaration parsing and handling.
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 04a522824f..7c9fe50b39 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -766,10 +766,11 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source, expandBuiltinMacro(identifierToken, spell); else { -#ifdef ICHECK_BUILD - if(spell != "Q_PROPERTY" && spell != "Q_INVOKABLE" && spell != "Q_ENUMS" - && spell != "Q_FLAGS" && spell != "Q_DECLARE_FLAGS"){ -#endif + if (spell != "Q_PROPERTY" && spell != "Q_INVOKABLE" && spell != "Q_ENUMS" + && spell != "Q_FLAGS" && spell != "Q_DECLARE_FLAGS") { + + // ### FIXME: shouldn't this be T_Q_PROPERTY & friends? + if (Macro *m = env->resolve(spell)) { if (! m->isFunctionLike()) { if (0 == (m = processObjectLikeMacro(identifierToken, spell, m))) @@ -790,9 +791,7 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source, } } } -#ifdef ICHECK_BUILD } -#endif // it's not a function or object-like macro. out(spell); } |