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

remove pointless code from prl processing

Browse Source 
the code had a dead variable assignment and no side effects.

Change-Id: I9add8f1776f23a29c103b46dc725b9f386a4495a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-06-02 20:06:42 +02:00
parent efe9c7ddbb
commit e0470ba2fe
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qmake/generators/unix/unixmake.cpp
View File

@ -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));