1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove superfluous code from collectDependencies

Browse Source 
val.first was never used.

Change-Id: I7be631c09061d6969234502fc0d5660c147aca39
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
This commit is contained in:
Joerg Bornemann 2015-12-04 12:25:12 +01:00
parent 00abd1ddd2
commit b99300712f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -520,7 +520,6 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt
ProStringList tmpList; ProStringList tmpList;
tmpList += subdir.second; tmpList += subdir.second;
tmpList += allDependencies; tmpList += allDependencies;
QPair<QString, ProStringList> val = qMakePair(fi.absoluteFilePath(), tmpList);
// Initialize a 'fake' project to get the correct variables // Initialize a 'fake' project to get the correct variables
// and to be able to extract all the dependencies // and to be able to extract all the dependencies
Option::QMAKE_MODE old_mode = Option::qmake_mode; Option::QMAKE_MODE old_mode = Option::qmake_mode;
@ -552,8 +551,8 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt
newDep->target = newDep->target.left(newDep->target.length()-3) + "lib"; newDep->target = newDep->target.left(newDep->target.length()-3) + "lib";
projGuids.insert(newDep->orig_target, newDep->target); projGuids.insert(newDep->orig_target, newDep->target);
if (val.second.size()) { if (tmpList.size()) {
const ProStringList depends = val.second; const ProStringList depends = tmpList;
foreach (const ProString &dep, depends) { foreach (const ProString &dep, depends) {
QString depend = dep.toQString(); QString depend = dep.toQString();
if (!projGuids[depend].isEmpty()) { if (!projGuids[depend].isEmpty()) {
@ -565,8 +564,7 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt
newDep->dependencies << projGuids[projLookup[tmpDep]]; newDep->dependencies << projGuids[projLookup[tmpDep]];
} }
} else { } else {
QStringList dependencies = val.second.toQStringList(); extraSubdirs.insert(newDep, tmpList.toQStringList());
extraSubdirs.insert(newDep, dependencies);
newDep->dependencies.clear(); newDep->dependencies.clear();
break; break;
} }