From 10725c086b49fec2a5d0b6c1fc61171fcb2dcacb Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@me.com>
Date: Mon, 27 May 2013 11:37:50 +0200
Subject: [PATCH] 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 <nikolai.kosjar@digia.com>
---
 src/libs/cplusplus/pp-engine.cpp         | 4 ----
 src/plugins/cpptools/cppmodelmanager.cpp | 1 +
 2 files changed, 1 insertion(+), 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 &poundToken)
 
 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)
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index f168e6bfa85..7fa7fc3a38c 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -143,6 +143,7 @@ protected:
 
 static const char pp_configuration[] =
     "# 1 \"<configuration>\"\n"
+    "#define Q_CREATOR_RUN 1\n"
     "#define __cplusplus 1\n"
     "#define __extension__\n"
     "#define __context__\n"