feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProject: use CFLAGS in addition to CXXFLAGS

Browse Source 
Value will be passed to CppTools::ProjectPart::evaluateToolchain()

Change-Id: Ib365d91e9956fa59cc79107734c5ac8c89b34d4f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Sergey Shambir
2013-04-28 17:18:50 +04:00
parent 9a36ec3f39
commit 6344e2a02b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -71,6 +71,7 @@
static const char CONFIG_CPP_MODULE[] = "cpp"; static const char CONFIG_CPP_MODULE[] = "cpp";
static const char CONFIG_CXXFLAGS[] = "cxxflags"; static const char CONFIG_CXXFLAGS[] = "cxxflags";
static const char CONFIG_CFLAGS[] = "cflags";
static const char CONFIG_DEFINES[] = "defines"; static const char CONFIG_DEFINES[] = "defines";
static const char CONFIG_INCLUDEPATHS[] = "includePaths"; static const char CONFIG_INCLUDEPATHS[] = "includePaths";
static const char CONFIG_FRAMEWORKPATHS[] = "frameworkPaths"; static const char CONFIG_FRAMEWORKPATHS[] = "frameworkPaths";
@@ -472,6 +473,10 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData *prj)
QLatin1String(CONFIG_CPP_MODULE), QLatin1String(CONFIG_CPP_MODULE),
QLatin1String(CONFIG_CXXFLAGS)); QLatin1String(CONFIG_CXXFLAGS));
const QStringList cFlags = props.getModulePropertiesAsStringList(
QLatin1String(CONFIG_CPP_MODULE),
QLatin1String(CONFIG_CFLAGS));
QStringList list = props.getModulePropertiesAsStringList( QStringList list = props.getModulePropertiesAsStringList(
QLatin1String(CONFIG_CPP_MODULE), QLatin1String(CONFIG_CPP_MODULE),
QLatin1String(CONFIG_DEFINES)); QLatin1String(CONFIG_DEFINES));
@@ -504,10 +509,9 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData *prj)
QLatin1String(CONFIG_PRECOMPILEDHEADER)).toString(); QLatin1String(CONFIG_PRECOMPILEDHEADER)).toString();
CppTools::ProjectPart::Ptr part(new CppTools::ProjectPart); CppTools::ProjectPart::Ptr part(new CppTools::ProjectPart);
// TODO: qbs has separate variable for CFLAGS
part->evaluateToolchain(ProjectExplorer::ToolChainKitInformation::toolChain(k), part->evaluateToolchain(ProjectExplorer::ToolChainKitInformation::toolChain(k),
cxxFlags, cxxFlags,
cxxFlags, cFlags,
ProjectExplorer::SysRootKitInformation::sysRoot(k)); ProjectExplorer::SysRootKitInformation::sysRoot(k));
CppTools::ProjectFileAdder adder(part->files); CppTools::ProjectFileAdder adder(part->files);