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

Qt4Project: cpp code model add <configuration> and headers

Browse Source 
This makes the data which we pass on to the codemodel similar again to
before 3aab8beaf4

Task-number: QTCREATORBUG-7198
Change-Id: I40a4812b27b69efd788abc85532efbdda1bef7d6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Daniel Teske
2012-04-19 12:49:55 +02:00
parent 0457aac0c5
commit 2be819c89e
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1856,6 +1856,10 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
newVarValues[DefinesVar] = m_readerExact->values(QLatin1String("DEFINES")); newVarValues[DefinesVar] = m_readerExact->values(QLatin1String("DEFINES"));
newVarValues[IncludePathVar] = includePaths(m_readerExact); newVarValues[IncludePathVar] = includePaths(m_readerExact);
newVarValues[CppFlagsVar] = m_readerExact->values("QMAKE_CXXFLAGS"); 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"), newVarValues[CppSourceVar] = m_readerExact->absoluteFileValues(QLatin1String("SOURCES"),
m_projectDir, m_projectDir,
QStringList() << m_projectDir, QStringList() << m_projectDir,

1
src/plugins/qt4projectmanager/qt4nodes.h
View File

@@ -83,6 +83,7 @@ enum Qt4Variable {
DefinesVar = 1, DefinesVar = 1,
IncludePathVar, IncludePathVar,
CppFlagsVar, CppFlagsVar,
CppHeaderVar,
CppSourceVar, CppSourceVar,
ObjCSourceVar, ObjCSourceVar,
UiDirVar, UiDirVar,

2
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -543,6 +543,8 @@ void Qt4Project::updateCppCodeModel()
part->flags = tc->compilerFlags(pro->variableValue(CppFlagsVar)); part->flags = tc->compilerFlags(pro->variableValue(CppFlagsVar));
part->sourceFiles = pro->variableValue(CppSourceVar); part->sourceFiles = pro->variableValue(CppSourceVar);
part->sourceFiles += pro->variableValue(CppHeaderVar);
part->sourceFiles.prepend(QLatin1String("<configuration>"));
pinfo.appendProjectPart(part); pinfo.appendProjectPart(part);
allFiles += part->sourceFiles; allFiles += part->sourceFiles;