summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-19 17:52:29 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-28 00:09:45 +0200
commit5e965df21d2bcaf236c4f79b6a73db6f3f2c0459 (patch)
tree08198bf3d696a7345316ce57a12a737b06db75a9 /qmake
parent5bc9541e7a3a55849020d79ee7d7b4d0996ce2ff (diff)
do not look for frameworks in library path
it's just wrong Change-Id: Ia21e9fb7e67623d6c4f70eab1f76360624ba314b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/unix/unixmake.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 13ee57fae0..dc991ab9d3 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -626,9 +626,8 @@ UnixMakefileGenerator::processPrlFiles()
else
opt = l.at(++lit);
opt = opt.trimmed();
- const QList<QMakeLocalFileName> dirs = frameworkdirs + libdirs;
- for(int dep_i = 0; dep_i < dirs.size(); ++dep_i) {
- QString prl = dirs[dep_i].local() + "/" + opt + ".framework/" + opt + Option::prl_ext;
+ foreach (const QMakeLocalFileName &dir, frameworkdirs) {
+ QString prl = dir.local() + "/" + opt + ".framework/" + opt + Option::prl_ext;
if(processPrlFile(prl))
break;
}