feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Add identifying macro Q_CREATOR_RUN

Browse Source 
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>
This commit is contained in:
Nikolai Kosjar
2017-11-20 13:30:36 +01:00
parent 7186456fd5
commit 2abf1f29cc
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -78,6 +78,12 @@ public:
{ {
} }
void addToolchainAndProjectMacros() final
{
addMacros({ProjectExplorer::Macro("Q_CREATOR_RUN", "1")});
CompilerOptionsBuilder::addToolchainAndProjectMacros();
}
void addExtraOptions() final void addExtraOptions() final
{ {
addDummyUiHeaderOnDiskIncludePath(); addDummyUiHeaderOnDiskIncludePath();

2
src/plugins/cpptools/compileroptionsbuilder.h
View File

@@ -54,7 +54,7 @@ public:
virtual void enableExceptions(); virtual void enableExceptions();
void addHeaderPathOptions(); void addHeaderPathOptions();
void addPrecompiledHeaderOptions(PchUsage pchUsage); void addPrecompiledHeaderOptions(PchUsage pchUsage);
void addToolchainAndProjectMacros(); virtual void addToolchainAndProjectMacros();
void addMacros(const ProjectExplorer::Macros &macros); void addMacros(const ProjectExplorer::Macros &macros);
virtual void addLanguageOption(ProjectFile::Kind fileKind); virtual void addLanguageOption(ProjectFile::Kind fileKind);
virtual void addOptionsForLanguage(bool checkForBorlandExtensions = true); virtual void addOptionsForLanguage(bool checkForBorlandExtensions = true);