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

don't process .prl files recursively

Browse Source 
they are self-contained, as they are the result of another project's
full resolution. consequently, recursing them just burns cycles, and
additionally introduces the risk of an endless loop if the file is
botched.

Task-number: QTBUG-12711
Change-Id: I401ee691c170092cc61fe05538cec4272ed8f922
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-05-27 20:58:44 +02:00
parent 85c12d5745
commit 275709fb43
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/unix/unixmake.cpp
View File

@ -612,7 +612,7 @@ UnixMakefileGenerator::processPrlFiles()
ProStringList &prl_libs = project->values("QMAKE_CURRENT_PRL_LIBS"); ProStringList &prl_libs = project->values("QMAKE_CURRENT_PRL_LIBS");
if(!prl_libs.isEmpty()) { if(!prl_libs.isEmpty()) {
for(int prl = 0; prl < prl_libs.size(); ++prl) for(int prl = 0; prl < prl_libs.size(); ++prl)
l.insert(lit+prl+1, prl_libs.at(prl).toQString()); l.insert(++lit, prl_libs.at(prl));
prl_libs.clear(); prl_libs.clear();
} }
} }

2
qmake/generators/win32/winmakefile.cpp
View File

@ -234,7 +234,7 @@ Win32MakefileGenerator::processPrlFiles()
} }
ProStringList &prl_libs = project->values("QMAKE_CURRENT_PRL_LIBS"); ProStringList &prl_libs = project->values("QMAKE_CURRENT_PRL_LIBS");
for (int prl = 0; prl < prl_libs.size(); ++prl) for (int prl = 0; prl < prl_libs.size(); ++prl)
l.insert(lit + prl + 1, prl_libs.at(prl)); l.insert(++lit, prl_libs.at(prl));
prl_libs.clear(); prl_libs.clear();
} }