diff options
| author | Erik Verbruggen <[email protected]> | 2013-05-27 11:37:50 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <[email protected]> | 2013-06-03 15:41:54 +0200 |
| commit | 10725c086b49fec2a5d0b6c1fc61171fcb2dcacb (patch) | |
| tree | d5e61e031e8b759111eb341b1fdf1c184bbf88cb /src/libs/cplusplus/pp-engine.cpp | |
| parent | ce4edd7930e5ad245c08a76344669a8f03688c65 (diff) | |
C++: fix Q_CREATOR_RUN macro handling
Moved it from the handleIfDefDirective to the pre-defined macros, so
that #if defined() can also see it.
Task-number: QTCREATORBUG-9322
Change-Id: Icbecad5c885dd2374b559969c99631c3ddc73844
Reviewed-by: Nikolai Kosjar <[email protected]>
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 77ff055b1bc..3643601a85c 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -1900,8 +1900,6 @@ void Preprocessor::handleEndIfDirective(PPToken *tk, const PPToken £Token) void Preprocessor::handleIfDefDirective(bool checkUndefined, PPToken *tk) { - static const QByteArray qCreatorRun("Q_CREATOR_RUN"); - lex(tk); // consume "ifdef" token if (tk->is(T_IDENTIFIER)) { if (checkUndefined && m_state.m_ifLevel == 0) @@ -1922,8 +1920,6 @@ void Preprocessor::handleIfDefDirective(bool checkUndefined, PPToken *tk) } } else if (m_env->isBuiltinMacro(macroName)) { value = true; - } else if (macroName == qCreatorRun) { - value = true; } if (checkUndefined) |