don't process .prl files recursively
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:
parent
85c12d5745
commit
275709fb43
@ -612,7 +612,7 @@ UnixMakefileGenerator::processPrlFiles()
|
||||
ProStringList &prl_libs = project->values("QMAKE_CURRENT_PRL_LIBS");
|
||||
if(!prl_libs.isEmpty()) {
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
@ -234,7 +234,7 @@ Win32MakefileGenerator::processPrlFiles()
|
||||
}
|
||||
ProStringList &prl_libs = project->values("QMAKE_CURRENT_PRL_LIBS");
|
||||
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();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user