From 5fa9e4272565dc0f89fa418a5b0b23871f65e708 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@theqtcompany.com>
Date: Wed, 13 Jan 2016 12:11:07 +0100
Subject: Adapt to removal of cpptools/cppprojects.h

Change-Id: I914700271f28f3fdef9c7f30ed7cb2fc65d4d39e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
 plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp        | 4 +++-
 plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h          | 2 +-
 plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp | 1 -
 plugins/clangstaticanalyzer/clangstaticanalyzertool.h                | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index 2fd06d881c..1d882a9255 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -31,9 +31,10 @@
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
+#include <cpptools/compileroptionsbuilder.h>
 #include <cpptools/cppmodelmanager.h>
-#include <cpptools/cppprojects.h>
 #include <cpptools/cppprojectfile.h>
+#include <cpptools/projectinfo.h>
 
 #include <projectexplorer/abi.h>
 #include <projectexplorer/buildconfiguration.h>
@@ -42,6 +43,7 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
+#include <projectexplorer/toolchain.h>
 
 #include <utils/algorithm.h>
 
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
index b5baafb4b7..4322324b48 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
@@ -20,7 +20,7 @@
 #define CLANGSTATICANALYZERRUNCONTROL_H
 
 #include <analyzerbase/analyzerruncontrol.h>
-#include <cpptools/cppprojects.h>
+#include <cpptools/projectinfo.h>
 #include <utils/environment.h>
 
 #include <QFutureInterface>
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
index a61dcbe273..9674579aa4 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
@@ -27,7 +27,6 @@
 #include <coreplugin/icontext.h>
 
 #include <cpptools/cppmodelmanager.h>
-#include <cpptools/cppprojects.h>
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/gcctoolchain.h>
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzertool.h b/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
index e9000fa78b..7bb4b1cbe7 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
@@ -20,7 +20,7 @@
 #define CLANGSTATICANALYZERTOOL_H
 
 #include <analyzerbase/ianalyzertool.h>
-#include <cpptools/cppprojects.h>
+#include <cpptools/projectinfo.h>
 
 #include <QHash>
 
-- 
cgit v1.2.1