From ffe7f408ead8d70e15a2b981b9a28e5f70100173 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 2 Jun 2015 19:58:41 +0200 Subject: remove bizarre prl substitution code it appears to have been some weird attempt at back-mapping file names to -l arguments, which has been made ineffective with the partial #if 0. i can't even describe what it did at this point. Change-Id: Ie31cbbe7fab8b21b039bfff5877397af07731f1b Reviewed-by: Joerg Bornemann --- qmake/generators/unix/unixmake.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'qmake/generators/unix') diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 0cd0ee596f..8e539ca230 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -550,15 +550,7 @@ UnixMakefileGenerator::processPrlFiles() } } } else if(!opt.isNull()) { - QString lib = opt; - processPrlFile(lib); -#if 0 - if(ret) - opt = linkLib(lib, ""); -#endif - if(!opt.isEmpty()) - for (int k = 0; k < l.size(); ++k) - l[k] = l.at(k).toQString().replace(lib, opt); + processPrlFile(opt); } ProStringList &prl_libs = project->values("QMAKE_CURRENT_PRL_LIBS"); -- cgit v1.2.3