From e0470ba2fe9ab80cc857c81cdcd1687ecd909a23 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 2 Jun 2015 20:06:42 +0200 Subject: remove pointless code from prl processing the code had a dead variable assignment and no side effects. Change-Id: I9add8f1776f23a29c103b46dc725b9f386a4495a Reviewed-by: Joerg Bornemann --- qmake/generators/unix/unixmake.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'qmake/generators/unix') diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 8e539ca230..c813e50d79 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -485,14 +485,6 @@ UnixMakefileGenerator::findLibraries() return false; } -QString linkLib(const QString &file, const QString &libName) { - QString ret; - QRegExp reg("^.*lib(" + QRegExp::escape(libName) + "[^./=]*).*$"); - if(reg.exactMatch(file)) - ret = "-l" + reg.cap(1); - return ret; -} - void UnixMakefileGenerator::processPrlFiles() { @@ -527,12 +519,8 @@ UnixMakefileGenerator::processPrlFiles() } QString prl = lfn.local() + '/' + project->first("QMAKE_PREFIX_SHLIB") + lib + prl_ext; - if(processPrlFile(prl)) { - if(prl.startsWith(lfn.local())) - prl.replace(0, lfn.local().length(), lfn.real()); - opt = linkLib(prl, lib); + if (processPrlFile(prl)) break; - } } } else if (target_mode == TARG_MAC_MODE && opt.startsWith("-F")) { QMakeLocalFileName f(opt.right(opt.length()-2)); -- cgit v1.2.3