From 2abf1f29cc9a17c030b4c402cb11f0526540e895 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Mon, 20 Nov 2017 13:30:36 +0100
Subject: [PATCH] Clang: Add identifying macro Q_CREATOR_RUN

Use the same we use for the built-in code model.

This is useful for conditions of pragmas.

Task-number: QTCREATORBUG-16847
Change-Id: I4c83be46bb2b8a23e4c8f70d98e2b4c9572121ee
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/clangcodemodel/clangutils.cpp     | 6 ++++++
 src/plugins/cpptools/compileroptionsbuilder.h | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index 0058ee4023b..1ad979578df 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -78,6 +78,12 @@ public:
     {
     }
 
+    void addToolchainAndProjectMacros() final
+    {
+        addMacros({ProjectExplorer::Macro("Q_CREATOR_RUN", "1")});
+        CompilerOptionsBuilder::addToolchainAndProjectMacros();
+    }
+
     void addExtraOptions() final
     {
         addDummyUiHeaderOnDiskIncludePath();
diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h
index 8ca985dc28c..9274a1bafc1 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.h
+++ b/src/plugins/cpptools/compileroptionsbuilder.h
@@ -54,7 +54,7 @@ public:
     virtual void enableExceptions();
     void addHeaderPathOptions();
     void addPrecompiledHeaderOptions(PchUsage pchUsage);
-    void addToolchainAndProjectMacros();
+    virtual void addToolchainAndProjectMacros();
     void addMacros(const ProjectExplorer::Macros &macros);
     virtual void addLanguageOption(ProjectFile::Kind fileKind);
     virtual void addOptionsForLanguage(bool checkForBorlandExtensions = true);