Merge remote-tracking branch 'origin/4.5'

Conflicts: src/plugins/clangcodemodel/clangutils.cpp src/plugins/cpptools/clangcompileroptionsbuilder.cpp src/plugins/cpptools/compileroptionsbuilder.cpp Change-Id: I0728f08171103259407bbbb35f93b70c2f2e18d0
2017-11-21 13:28:55 +01:00
parent cbc9b61f19 194bde265c
commit 89f9f22035
26 changed files with 201 additions and 42 deletions
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -95,6 +95,12 @@ public:
        addWrappedQtHeadersIncludePath();
    }

+    void addToolchainAndProjectMacros() final
+    {
+        addMacros({ProjectExplorer::Macro("Q_CREATOR_RUN", "1")});
+        CompilerOptionsBuilder::addToolchainAndProjectMacros();
+    }
+
    void addExtraOptions() final
    {
        addDummyUiHeaderOnDiskIncludePath();