Commit 2be819c8 authored by Daniel Teske's avatar Daniel Teske
Browse files

Qt4Project: cpp code model add <configuration> and headers

This makes the data which we pass on to the codemodel similar again to
before 3aab8bea



Task-number: QTCREATORBUG-7198
Change-Id: I40a4812b27b69efd788abc85532efbdda1bef7d6
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 0457aac0
......@@ -1856,6 +1856,10 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
newVarValues[DefinesVar] = m_readerExact->values(QLatin1String("DEFINES"));
newVarValues[IncludePathVar] = includePaths(m_readerExact);
newVarValues[CppFlagsVar] = m_readerExact->values("QMAKE_CXXFLAGS");
newVarValues[CppHeaderVar] = m_readerExact->absoluteFileValues(QLatin1String("HEADERS"),
m_projectDir,
QStringList() << m_projectDir,
0);
newVarValues[CppSourceVar] = m_readerExact->absoluteFileValues(QLatin1String("SOURCES"),
m_projectDir,
QStringList() << m_projectDir,
......
......@@ -83,6 +83,7 @@ enum Qt4Variable {
DefinesVar = 1,
IncludePathVar,
CppFlagsVar,
CppHeaderVar,
CppSourceVar,
ObjCSourceVar,
UiDirVar,
......
......@@ -543,6 +543,8 @@ void Qt4Project::updateCppCodeModel()
part->flags = tc->compilerFlags(pro->variableValue(CppFlagsVar));
part->sourceFiles = pro->variableValue(CppSourceVar);
part->sourceFiles += pro->variableValue(CppHeaderVar);
part->sourceFiles.prepend(QLatin1String("<configuration>"));
pinfo.appendProjectPart(part);
allFiles += part->sourceFiles;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment