forked from qt-creator/qt-creator
remove dead variable from QmakeProject::updateCppCodeModel()
allFiles was never read. Change-Id: I96aa00ec43db342a572a41f1662ad3d76979f3b4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
@@ -423,7 +423,6 @@ void QmakeProject::updateCppCodeModel()
|
|||||||
}
|
}
|
||||||
|
|
||||||
QList<ProjectExplorer::ExtraCompiler *> generators;
|
QList<ProjectExplorer::ExtraCompiler *> generators;
|
||||||
QStringList allFiles;
|
|
||||||
foreach (QmakeProFileNode *pro, proFiles) {
|
foreach (QmakeProFileNode *pro, proFiles) {
|
||||||
warnOnToolChainMismatch(pro);
|
warnOnToolChainMismatch(pro);
|
||||||
|
|
||||||
@@ -465,11 +464,9 @@ void QmakeProject::updateCppCodeModel()
|
|||||||
{ // C++ files:
|
{ // C++ files:
|
||||||
// part->files
|
// part->files
|
||||||
foreach (const QString &file, pro->variableValue(CppSourceVar)) {
|
foreach (const QString &file, pro->variableValue(CppSourceVar)) {
|
||||||
allFiles << file;
|
|
||||||
cppPart->files << ProjectFile(file, ProjectFile::CXXSource);
|
cppPart->files << ProjectFile(file, ProjectFile::CXXSource);
|
||||||
}
|
}
|
||||||
foreach (const QString &file, pro->variableValue(CppHeaderVar)) {
|
foreach (const QString &file, pro->variableValue(CppHeaderVar)) {
|
||||||
allFiles << file;
|
|
||||||
cppPart->files << ProjectFile(file, ProjectFile::CXXHeader);
|
cppPart->files << ProjectFile(file, ProjectFile::CXXHeader);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -477,13 +474,11 @@ void QmakeProject::updateCppCodeModel()
|
|||||||
ProjectPart::Ptr objcppPart = templatePart->copy();
|
ProjectPart::Ptr objcppPart = templatePart->copy();
|
||||||
{ // ObjC++ files:
|
{ // ObjC++ files:
|
||||||
foreach (const QString &file, pro->variableValue(ObjCSourceVar)) {
|
foreach (const QString &file, pro->variableValue(ObjCSourceVar)) {
|
||||||
allFiles << file;
|
|
||||||
// Although the enum constant is called ObjCSourceVar, it actually is ObjC++ source
|
// Although the enum constant is called ObjCSourceVar, it actually is ObjC++ source
|
||||||
// code, as qmake does not handle C (and ObjC).
|
// code, as qmake does not handle C (and ObjC).
|
||||||
objcppPart->files << ProjectFile(file, ProjectFile::ObjCXXSource);
|
objcppPart->files << ProjectFile(file, ProjectFile::ObjCXXSource);
|
||||||
}
|
}
|
||||||
foreach (const QString &file, pro->variableValue(ObjCHeaderVar)) {
|
foreach (const QString &file, pro->variableValue(ObjCHeaderVar)) {
|
||||||
allFiles << file;
|
|
||||||
objcppPart->files << ProjectFile(file, ProjectFile::ObjCXXHeader);
|
objcppPart->files << ProjectFile(file, ProjectFile::ObjCXXHeader);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -505,7 +500,6 @@ void QmakeProject::updateCppCodeModel()
|
|||||||
foreach (ProjectExplorer::ExtraCompiler *ec, proGenerators) {
|
foreach (ProjectExplorer::ExtraCompiler *ec, proGenerators) {
|
||||||
ec->forEachTarget([&](const Utils::FileName &generatedFile) {
|
ec->forEachTarget([&](const Utils::FileName &generatedFile) {
|
||||||
QString name = generatedFile.toString();
|
QString name = generatedFile.toString();
|
||||||
allFiles << name;
|
|
||||||
ProjectFile::Kind kind = ProjectFile::classify(name);
|
ProjectFile::Kind kind = ProjectFile::classify(name);
|
||||||
switch (kind) {
|
switch (kind) {
|
||||||
case ProjectFile::CHeader:
|
case ProjectFile::CHeader:
|
||||||
|
Reference in New Issue
Block a user