ClangPchManager: Add UsedMacroFilter

The compiler macros are filtered in system and project macros. Not used
ones are removed. The original order of the macros is retained.

Task-number: QTCREATORBUG-21548
Change-Id: Ic9265866bde033e6a9600f9e6439b1697ab73422
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/plugins/clangpchmanager/projectupdater.cpp b/src/plugins/clangpchmanager/projectupdater.cpp
index a3fbb6cb62..7929059850 100644
--- a/src/plugins/clangpchmanager/projectupdater.cpp
+++ b/src/plugins/clangpchmanager/projectupdater.cpp
@@ -156,10 +156,11 @@ QStringList ProjectUpdater::compilerArguments(CppTools::ProjectPart *projectPart
 
 ClangBackEnd::CompilerMacros ProjectUpdater::createCompilerMacros(const ProjectExplorer::Macros &projectMacros)
 {
-    auto macros =  Utils::transform<ClangBackEnd::CompilerMacros>(projectMacros,
-                                                                  [] (const ProjectExplorer::Macro &macro) {
-        return ClangBackEnd::CompilerMacro{macro.key, macro.value};
-    });
+    int index = 0;
+    auto macros = Utils::transform<ClangBackEnd::CompilerMacros>(
+        projectMacros, [&](const ProjectExplorer::Macro &macro) {
+            return ClangBackEnd::CompilerMacro{macro.key, macro.value, ++index};
+        });
 
     std::sort(macros.begin(), macros.end());