From 002d0c1d855d6ed08b311ef02ba5b7bf04ed41c2 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Thu, 16 Oct 2014 14:07:47 +0200
Subject: [PATCH] Align to qt-creator 3.3 changes

Change-Id: I3873c869f678c82b1e88c3860f62385de19ff20d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
 .../clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index b459f5c0229..1509e153107 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -31,6 +31,7 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 
 #include <cpptools/cppmodelmanager.h>
+#include <cpptools/cppprojects.h>
 #include <cpptools/cppprojectfile.h>
 
 #include <projectexplorer/projectexplorer.h>
@@ -146,8 +147,8 @@ void ClangStaticAnalyzerRunControl::stopEngine()
 QStringList createDefinesAndIncludesOptions(const ProjectPart::Ptr projectPart)
 {
     QStringList result;
-    result += ClangCodeModel::Utils::createDefineOptions(projectPart->projectDefines, false);
-    result += ClangCodeModel::Utils::createHeaderPathOptions(projectPart->headerPaths);
+    result += CppTools::CompilerOptionsBuilder::createDefineOptions(projectPart->projectDefines);
+    result += CppTools::CompilerOptionsBuilder::createHeaderPathOptions(projectPart->headerPaths);
     result += QLatin1String("-fPIC"); // TODO: Remove?
     return result;
 }