From 2ddb1f98495d283086062e6b81b164b7ce5bfab8 Mon Sep 17 00:00:00 2001
From: Sergey Shambir <sergey.shambir.auto@gmail.com>
Date: Sun, 28 Apr 2013 19:43:13 +0400
Subject: [PATCH] GenericProject: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.
Change-Id: I97c643707e1626424824aa9b53786f146b0f4790
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/genericprojectmanager/genericproject.cpp | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 3b2a2d1e0e5..bfffbfd17dd 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -254,15 +254,8 @@ void GenericProject::refresh(RefreshOptions options)
Kit *k = activeTarget() ? activeTarget()->kit() : KitManager::instance()->defaultKit();
if (ToolChain *tc = ToolChainKitInformation::toolChain(k)) {
QStringList cxxflags; // FIXME: Can we do better?
- part->defines = tc->predefinedMacros(cxxflags);
- part->defines += '\n';
-
- foreach (const HeaderPath &headerPath, tc->systemHeaderPaths(cxxflags, SysRootKitInformation::sysRoot(k))) {
- if (headerPath.kind() == HeaderPath::FrameworkHeaderPath)
- part->frameworkPaths.append(headerPath.path());
- else
- part->includePaths.append(headerPath.path());
- }
+ part->evaluateToolchain(tc, cxxflags, cxxflags,
+ SysRootKitInformation::sysRoot(k));
}
part->includePaths += allIncludePaths();
--
GitLab