diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-08 07:09:26 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-08 07:09:47 +0100 |
| commit | 3ec31ef9c5acd57a4a59c0d5f5e20b8d9a19bfa1 (patch) | |
| tree | 8b55dd13dbc2a33fe7c857f622e10b817386bdb3 /qmake | |
| parent | 6f87f2d23fb50d8183ea173fe423b7e1a24c0e2e (diff) | |
| parent | 4ad8798de428b44fe4c56e1ca111940068056c57 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I2532c7f7db5e6cc3ef09753d886279816dd662b2
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index c9f0d92eb9..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; } @@ -585,7 +583,7 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt wit != where.end(); ++wit) { const ProStringList &l = tmp_proj.values(ProKey(*wit)); for (ProStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { - QString opt = (*it).toQString(); + const QString opt = fixLibFlag(*it).toQString(); if (!opt.startsWith("/") && // Not a switch opt != newDep->target && // Not self opt != "opengl32.lib" && // We don't care about these libs |