From 6344e2a02b84443baaff84a99fb9be90ca1fc733 Mon Sep 17 00:00:00 2001
From: Sergey Shambir <sergey.shambir.auto@gmail.com>
Date: Sun, 28 Apr 2013 17:18:50 +0400
Subject: [PATCH] QbsProject: use CFLAGS in addition to CXXFLAGS
Value will be passed to CppTools::ProjectPart::evaluateToolchain()
Change-Id: Ib365d91e9956fa59cc79107734c5ac8c89b34d4f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/qbsprojectmanager/qbsproject.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index a8d0116d46f..bf1bad50d8b 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -71,6 +71,7 @@
static const char CONFIG_CPP_MODULE[] = "cpp";
static const char CONFIG_CXXFLAGS[] = "cxxflags";
+static const char CONFIG_CFLAGS[] = "cflags";
static const char CONFIG_DEFINES[] = "defines";
static const char CONFIG_INCLUDEPATHS[] = "includePaths";
static const char CONFIG_FRAMEWORKPATHS[] = "frameworkPaths";
@@ -472,6 +473,10 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData *prj)
QLatin1String(CONFIG_CPP_MODULE),
QLatin1String(CONFIG_CXXFLAGS));
+ const QStringList cFlags = props.getModulePropertiesAsStringList(
+ QLatin1String(CONFIG_CPP_MODULE),
+ QLatin1String(CONFIG_CFLAGS));
+
QStringList list = props.getModulePropertiesAsStringList(
QLatin1String(CONFIG_CPP_MODULE),
QLatin1String(CONFIG_DEFINES));
@@ -504,10 +509,9 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData *prj)
QLatin1String(CONFIG_PRECOMPILEDHEADER)).toString();
CppTools::ProjectPart::Ptr part(new CppTools::ProjectPart);
- // TODO: qbs has separate variable for CFLAGS
part->evaluateToolchain(ProjectExplorer::ToolChainKitInformation::toolChain(k),
cxxFlags,
- cxxFlags,
+ cFlags,
ProjectExplorer::SysRootKitInformation::sysRoot(k));
CppTools::ProjectFileAdder adder(part->files);
--
GitLab