AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stub out MakefileGenerator::processPrlFiles()

Browse Source 
the unix and windows variants don't rely on it.
not making it purely virtual only because the project generator inherits
MakefileGenerator as well but does not need an implementation.

Change-Id: I80099b3f5d07cd037b408cf1099c58ff3a2904cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-07-20 12:29:21 +02:00 committed by Qt by Nokia
parent a806c6a8b2
commit 02cbc0746d
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qmake/generators/makefile.cpp
View File

@ -962,25 +962,7 @@ MakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
void void
MakefileGenerator::processPrlFiles() MakefileGenerator::processPrlFiles()
{ {
QHash<QString, bool> processed; qFatal("MakefileGenerator::processPrlFiles() called!");
for(bool ret = false; true; ret = false) {
//read in any prl files included..
QStringList l_out;
QStringList &l = project->values("QMAKE_LIBS");
for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
QString file = (*it);
if(!processed.contains(file) && processPrlFile(file)) {
processed.insert(file, true);
ret = true;
}
if(!file.isEmpty())
l_out.append(file);
}
if(ret)
l = l_out;
else
break;
}
} }
void void