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

Qmake: Pass on QMAKE_CFLAGS to the code model

Browse Source 
Change-Id: I87c07177adcfd72c7852f84266feb9baf1f87e5b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Tobias Hunger
2017-11-03 12:26:21 +01:00
parent 74570e833d
commit 19e125ce5f
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -1420,6 +1420,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input)
result->newVarValues[Variable::IncludePath] = includePaths(exactReader, input.sysroot, result->newVarValues[Variable::IncludePath] = includePaths(exactReader, input.sysroot,
input.buildDirectory, input.projectDir); input.buildDirectory, input.projectDir);
result->newVarValues[Variable::CppFlags] = exactReader->values(QLatin1String("QMAKE_CXXFLAGS")); result->newVarValues[Variable::CppFlags] = exactReader->values(QLatin1String("QMAKE_CXXFLAGS"));
result->newVarValues[Variable::CFlags] = exactReader->values(QLatin1String("QMAKE_CFLAGS"));
result->newVarValues[Variable::Source] = result->newVarValues[Variable::Source] =
fileListForVar(exactSourceFiles, QLatin1String("SOURCES")) + fileListForVar(exactSourceFiles, QLatin1String("SOURCES")) +
fileListForVar(cumulativeSourceFiles, QLatin1String("SOURCES")) + fileListForVar(cumulativeSourceFiles, QLatin1String("SOURCES")) +

1
src/plugins/qmakeprojectmanager/qmakeparsernodes.h
View File

@@ -64,6 +64,7 @@ enum class Variable {
Defines = 1, Defines = 1,
IncludePath, IncludePath,
CppFlags, CppFlags,
CFlags,
Source, Source,
ExactResource, ExactResource,
CumulativeResource, CumulativeResource,

2
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -294,8 +294,8 @@ void QmakeProject::updateCppCodeModel()
rpp.setBuildTargetType(isExecutable ? CppTools::ProjectPart::Executable rpp.setBuildTargetType(isExecutable ? CppTools::ProjectPart::Executable
: CppTools::ProjectPart::Library); : CppTools::ProjectPart::Library);
// TODO: Handle QMAKE_CFLAGS
rpp.setFlagsForCxx({cxxToolChain, pro->variableValue(Variable::CppFlags)}); rpp.setFlagsForCxx({cxxToolChain, pro->variableValue(Variable::CppFlags)});
rpp.setFlagsForC({cToolChain, pro->variableValue(Variable::CFlags)});
rpp.setMacros(ProjectExplorer::Macro::toMacros(pro->cxxDefines())); rpp.setMacros(ProjectExplorer::Macro::toMacros(pro->cxxDefines()));
rpp.setPreCompiledHeaders(pro->variableValue(Variable::PrecompiledHeader)); rpp.setPreCompiledHeaders(pro->variableValue(Variable::PrecompiledHeader));
rpp.setSelectedForBuilding(pro->includedInExactParse()); rpp.setSelectedForBuilding(pro->includedInExactParse());