diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-12-04 12:25:12 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-12-04 15:05:15 +0000 |
| commit | b99300712f88925047a955fd974ca3608bc11450 (patch) | |
| tree | 313282d7054748ddc71da73ea2f5952164886e59 /qmake/generators | |
| parent | 00abd1ddd28c5e6a18b4e9d022c1c3c8273cba96 (diff) | |
Remove superfluous code from collectDependencies
val.first was never used.
Change-Id: I7be631c09061d6969234502fc0d5660c147aca39
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index e90a319828..d70480b028 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -520,7 +520,6 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt ProStringList tmpList; tmpList += subdir.second; tmpList += allDependencies; - QPair<QString, ProStringList> val = qMakePair(fi.absoluteFilePath(), tmpList); // Initialize a 'fake' project to get the correct variables // and to be able to extract all the dependencies 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"; projGuids.insert(newDep->orig_target, newDep->target); - if (val.second.size()) { - const ProStringList depends = val.second; + if (tmpList.size()) { + const ProStringList depends = tmpList; foreach (const ProString &dep, depends) { QString depend = dep.toQString(); if (!projGuids[depend].isEmpty()) { @@ -565,8 +564,7 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt newDep->dependencies << projGuids[projLookup[tmpDep]]; } } else { - QStringList dependencies = val.second.toQStringList(); - extraSubdirs.insert(newDep, dependencies); + extraSubdirs.insert(newDep, tmpList.toQStringList()); newDep->dependencies.clear(); break; } |