1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not look for frameworks in library path

Browse Source 
it's just wrong

Change-Id: Ia21e9fb7e67623d6c4f70eab1f76360624ba314b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-07-19 17:52:29 +02:00 committed by Qt by Nokia
parent 5bc9541e7a
commit 5e965df21d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,9 +626,8 @@ UnixMakefileGenerator::processPrlFiles()
else else
opt = l.at(++lit); opt = l.at(++lit);
opt = opt.trimmed(); opt = opt.trimmed();
const QList<QMakeLocalFileName> dirs = frameworkdirs + libdirs; foreach (const QMakeLocalFileName &dir, frameworkdirs) {
for(int dep_i = 0; dep_i < dirs.size(); ++dep_i) { QString prl = dir.local() + "/" + opt + ".framework/" + opt + Option::prl_ext;
QString prl = dirs[dep_i].local() + "/" + opt + ".framework/" + opt + Option::prl_ext;
if(processPrlFile(prl)) if(processPrlFile(prl))
break; break;
} }