From 02cbc0746db5b4ff0fd420814187d6773052684a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 20 Jul 2012 12:29:21 +0200 Subject: stub out MakefileGenerator::processPrlFiles() 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 Reviewed-by: Joerg Bornemann --- qmake/generators/makefile.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 5a53e9227e..5033bf47b2 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -962,25 +962,7 @@ MakefileGenerator::processPrlVariable(const QString &var, const QStringList &l) void MakefileGenerator::processPrlFiles() { - QHash processed; - 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; - } + qFatal("MakefileGenerator::processPrlFiles() called!"); } void -- cgit v1.2.3